--- loncom/interface/createaccount.pm 2010/08/22 20:06:36 1.40.2.2
+++ loncom/interface/createaccount.pm 2011/09/29 14:12:21 1.40.2.4
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.40.2.2 2010/08/22 20:06:36 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.4 2011/09/29 14:12:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -285,7 +285,7 @@ sub selfenroll_crumbs {
}
my $last_crumb;
if ($desc ne '') {
- $last_crumb = &mt('Self-enroll in [_1]',''.$desc.'');
+ $last_crumb = &mt('Self-enroll in [_1]',"$desc");
} else {
$last_crumb = &mt('Self-enroll');
}
@@ -796,6 +796,17 @@ sub get_creation_controls {
if (ref($usercreation->{'cancreate'}) eq 'HASH') {
if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
@statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
+ if (@statustocreate == 0) {
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($domain);
+ if (ref($types) eq 'ARRAY') {
+ if (@{$types} == 0) {
+ @statustocreate = ('default');
+ }
+ } else {
+ @statustocreate = ('default');
+ }
+ }
} else {
@statustocreate = ('default');
my ($othertitle,$usertypes,$types) =
@@ -974,7 +985,7 @@ sub username_check {
}
}
if ($checkfail) {
- $msg = '
'.&mt('Account creation unavailable').'
';
+ $msg = '
'.&mt('Account creation unavailable').'
';
if ($checkfail eq 'username') {
$msg .= ''.
&mt('A LON-CAPA account may not be created with the username you use.').
@@ -1000,7 +1011,7 @@ sub username_check {
if ($rowcount) {
if ($editable) {
if ($courseid ne '') {
- $msg = ''.&mt('User information').'
';
+ $msg = '
'.&mt('User information').'
';
}
$msg .= &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','','').'
';
} else {
@@ -1137,32 +1148,38 @@ sub invalid_state {
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
my $msg = ''.&mt('Account creation unavailable').'
';
if ($error eq 'baduseremail') {
- $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
+ $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');
} elsif ($error eq 'existinguser') {
- $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
+ $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
} elsif ($error eq 'userrules') {
- $msg = &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
+ $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
} elsif ($error eq 'userformat') {
- $msg = &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
+ $msg .= &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
} elsif ($error eq 'captcha') {
- $msg = &mt('Validation of the code your entered failed.');
+ $msg .= &mt('Validation of the code you entered failed.');
} elsif ($error eq 'noemails') {
- $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
+ $msg .= &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
}
$msg .= '';
if ($msgtext) {
$msg .= '
'.$msgtext;
}
- $msg .= &linkto_email_help($contact_email,$domdesc);
+ $msg .= &linkto_email_help($contact_email,$domdesc,$error);
return $msg;
}
sub linkto_email_help {
- my ($contact_email,$domdesc) = @_;
+ my ($contact_email,$domdesc,$error) = @_;
my $msg;
+ my $href = '/adm/helpdesk';
if ($contact_email ne '') {
my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
- $msg .= '
'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','','',$domdesc).'
';
+ $href .= '?origurl='.$escuri;
+ if ($error eq 'existinguser') {
+ my $escemail = &HTML::Entities::encode($env{'form.useremail'});
+ $href .= '&useremail='.$escemail.'&useraccount='.$escemail;
+ }
+ $msg .= '
'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','','',$domdesc).'
';
} else {
$msg .= '
'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'
';
}