version 1.23.2.2.2.3, 2012/02/14 15:48:55
|
version 1.23.2.2.2.4, 2012/02/17 03:28:25
|
Line 66 sub handler {
|
Line 66 sub handler {
|
return OK; |
return OK; |
} |
} |
my $contact_name = &mt('LON-CAPA helpdesk'); |
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 $server = $r->dir_config('lonHostID'); |
my $defdom = &Apache::lonnet::default_login_domain(); |
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 $handle = &Apache::lonnet::check_for_valid_session($r); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
if ($handle ne '') { |
if ($handle ne '') { |
Line 228 sub get_uname {
|
Line 232 sub get_uname {
|
sub send_token { |
sub send_token { |
my ($uname,$udom,$email,$server,$domdesc,$contact_name, |
my ($uname,$udom,$email,$server,$domdesc,$contact_name, |
$contact_email) = @_; |
$contact_email) = @_; |
my $msg = &mt('Thank you for your request to reset the password for your LON-CAPA account.').'<br /><br />'; |
my $msg = &mt('Thank you for your request to reset the password for your Mechanics Online account.').'<br /><br />'; |
|
|
my $now = time; |
my $now = time; |
my $temppasswd = &create_passwd(); |
my $temppasswd = &create_passwd(); |
Line 244 sub send_token {
|
Line 248 sub send_token {
|
my $esc_token = &escape($token); |
my $esc_token = &escape($token); |
my $showtime = &Apache::lonlocal::locallocaltime(time); |
my $showtime = &Apache::lonlocal::locallocaltime(time); |
my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token; |
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 Mechanics Online 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, |
my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name, |
$contact_email); |
$contact_email); |
if ($result eq 'ok') { |
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.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>'); |
$msg .= &mt('An e-mail sent to the e-mail address associated with your Mechanics Online account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>'); |
} else { |
} 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 Mechanics Online account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email); |
} |
} |
} else { |
} 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); |
Line 261 sub send_token {
|
Line 265 sub send_token {
|
sub send_mail { |
sub send_mail { |
my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_; |
my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_; |
if ($subject eq '') { |
if ($subject eq '') { |
$subject = &mt('Your LON-CAPA account'); |
$subject = &mt('Your Mechanics Online account'); |
} |
} |
my $outcome; |
my $outcome; |
my $requestmail = "To: $email\n". |
my $requestmail = "To: $email\n". |