--- loncom/interface/createaccount.pm 2008/07/04 18:53:22 1.8
+++ loncom/interface/createaccount.pm 2008/07/04 19:32:56 1.9
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.8 2008/07/04 18:53:22 raeburn Exp $
+# $Id: createaccount.pm,v 1.9 2008/07/04 19:32:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -320,7 +320,7 @@ sub print_username_form {
if (grep(/^email$/,@{$cancreate})) {
$output .= '
'.&mt('Create account with an e-mail address as your username').'
';
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.').'
';
+ $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.','
').'
';
} else {
$output .= '
';
}
@@ -444,7 +444,7 @@ 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).' '.
&mt('To complete this process please open a web browser and enter the following'
.' 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,
$contact_email);
if ($result eq 'ok') {
@@ -467,8 +467,9 @@ sub process_mailtoken {
my %data = &Apache::lonnet::tmpget($token);
my $now = time;
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.')
- .' '.&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.','
','');
+ $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.')
+ .' '.&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.','
','');
return $msg;
}
if (($data{'time'} =~ /^\d+$/) &&