version 1.8, 2008/07/04 18:53:22
|
version 1.9, 2008/07/04 19:32:56
|
Line 320 sub print_username_form {
|
Line 320 sub print_username_form {
|
if (grep(/^email$/,@{$cancreate})) { |
if (grep(/^email$/,@{$cancreate})) { |
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'; |
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'; |
if (grep(/^login$/,@{$cancreate})) { |
if (grep(/^login$/,@{$cancreate})) { |
$output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have a log-in ID at your institution.').'<br /><br />'; |
$output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','<br />').'<br /><br />'; |
} else { |
} else { |
$output .= '<br />'; |
$output .= '<br />'; |
} |
} |
Line 444 sub send_token {
|
Line 444 sub send_token {
|
my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '. |
my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '. |
&mt('To complete this process please open a web browser and enter the following' |
&mt('To complete this process please open a web browser and enter the following' |
.' URL in the address/location box: [_1]' |
.' URL in the address/location box: [_1]' |
,&Apache::lonnet::absolute_url().'/adm/createaccount?token=$esc_token'); |
,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
$contact_email); |
$contact_email); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
Line 467 sub process_mailtoken {
|
Line 467 sub process_mailtoken {
|
my %data = &Apache::lonnet::tmpget($token); |
my %data = &Apache::lonnet::tmpget($token); |
my $now = time; |
my $now = time; |
if (keys(%data) == 0) { |
if (keys(%data) == 0) { |
$msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid.') |
$msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.') |
.' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>'); |
.' '.&mt('Either the token included in the URL has been deleted or the URL you provided was invalid.') |
|
.' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','<a href="/adm/createaccount">','</a>'); |
return $msg; |
return $msg; |
} |
} |
if (($data{'time'} =~ /^\d+$/) && |
if (($data{'time'} =~ /^\d+$/) && |