'.$end_page);
return OK;
}
$start_page =
@@ -106,7 +112,9 @@ sub handler {
if (@cancreate == 0) {
&print_header($r,$start_page);
- my $output = &mt('Creation of a new user account using an e-mail address as username or a loginID from your institution is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);
+ my $output = '
'.&mt('Account creation unavailable').'
'.
+ ''.
+ &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted at this institution ([_1]).',$domdesc).'
';
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -121,17 +129,29 @@ sub handler {
&print_header($r,$start_page);
my ($output,$msg);
if (grep(/^sso$/,@cancreate)) {
- $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain.");
- ($output, my $checkfail) = &username_check($sso_username,$domain,$domdesc,$courseid);
+ $msg = '
'.&mt('Account creation').'
'.
+ &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'
';
+ ($output, my $checkfail) = &username_check($sso_username,$domain,
+ $domdesc,$courseid,
+ $lonhost,$contact_email);
if ($checkfail) {
- $msg .= &mt('A LON-CAPA account may not be created with the username you use.');
+ $msg .= '
'.&mt('Account creation unavailable');'
';
+ if ($checkfail eq 'username') {
+ $msg .= ''.
+ &mt('A LON-CAPA account may not be created with the username you use.').'';
+ } elsif ($checkfail eq 'authtoken') {
+ $msg .= ''.&mt('Error creating token.').'';
+ }
+ $msg .= '
'.
+ &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
} else {
$msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
}
} else {
- $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.");
+ $msg .= '
'.&mt('Account creation unavailable').'
'.
+ ''.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'
'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
- $r->print('
'.$msg.'
'.$output);
+ $r->print($msg.' '.$output);
$r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -181,7 +201,8 @@ sub handler {
$courseid);
} elsif ($env{'form.phase'} eq 'username_validation') {
$output = &username_validation($env{'form.uname'},$domain,$domdesc,
- $contact_name,$contact_email,$courseid);
+ $contact_name,$contact_email,$courseid,
+ $lonhost);
} elsif (!$token) {
my $now=time;
if (grep(/^login$/,@cancreate)) {
@@ -189,6 +210,9 @@ sub handler {
$r->print(<$jsh>);
$r->print(&javascript_setforms($now));
}
+ if (grep(/^email$/,@cancreate)) {
+ $r->print(&javascript_validmail());
+ }
$output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
$courseid);
}
@@ -245,7 +269,7 @@ ENDSCRIPT
sub javascript_checkpass {
my ($now) = @_;
- my $nopass = &mt('You must enter a password');
+ my $nopass = &mt('You must enter a password.');
my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.
&mt('Please try again.');
my $js = <<"ENDSCRIPT";
@@ -271,6 +295,27 @@ ENDSCRIPT
return $js;
}
+sub javascript_validmail {
+ my %lt = &Apache::lonlocal::texthash (
+ email => 'The e-mail address you entered',
+ notv => 'is not a valid e-mail address',
+ );
+ my $output = "\n".''."\n";
+ return $output;
+}
+
sub print_username_form {
my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
my %lt = &Apache::lonlocal::texthash(
@@ -283,8 +328,8 @@ sub print_username_form {
if (grep(/^login$/,@{$cancreate})) {
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
- $output = '
'.&mt('Create account with a username provided by your institution').'
';
- $output .= &mt('If you already have a Log-in ID at your institution, you may be able to use it[_1] for LON-CAPA.',' ').' '.&mt('Type in your Log-in ID and password to find out.').'
';
+ $output = '
'.&mt('Create account with a username provided by this institution').'
';
+ $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.',' ').'
'.&mt('Type in your log-in ID and password to find out.').'
';
my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -314,14 +359,14 @@ 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 [_1] 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 .= ' ';
}
my $emailform = '';
my $captchaform = &create_captcha();
my $submit_text = &mt('Request LON-CAPA account');
- $output .= '
';
} else {
- $output = &mt('Could not load javascript file [_1]','londes.js');
+ $output = &mt('Could not load javascript file [_1]','londes.js');
}
return $output;
}
@@ -628,7 +687,7 @@ sub create_account {
my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
$env{'form.serverid'});
# Error messages
- my $error = ''.&mt('Error').': ';
+ my $error = ''.&mt('Error:').' ';
my $end = '