--- loncom/interface/createaccount.pm 2008/07/08 17:52:16 1.13
+++ loncom/interface/createaccount.pm 2008/07/10 00:18:05 1.15
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.13 2008/07/08 17:52:16 raeburn Exp $
+# $Id: createaccount.pm,v 1.15 2008/07/10 00:18:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,7 +65,11 @@ sub handler {
}
my $domdesc = &Apache::lonnet::domain($domain,'description');
my $contact_name = &mt('LON-CAPA helpdesk');
- my $contact_email = $r->dir_config('lonSupportEMail');
+ my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+ my $contacts =
+ &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+ $domain,$origmail);
+ my ($contact_email) = split(',',$contacts);
my $lonhost = $r->dir_config('lonHostID');
my $include = $r->dir_config('lonIncludes');
my $start_page;
@@ -108,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 or an institutional log-in ID as username 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 in the domain: [_1] ([_2]).',$domain,$domdesc).'
';
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -123,21 +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.");
+ $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 in this domain.").'
';
($output, my $checkfail) = &username_check($sso_username,$domain,
$domdesc,$courseid,
- $lonhost,$contact_email);
- 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.');
+ $lonhost,$contact_email);
+ if ($checkfail) {
+ $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 in this domain, 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;
}
@@ -456,7 +470,9 @@ sub process_email_request {
sub send_token {
my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
- my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'
';
+ my $msg = ''.&mt('Account creation status').'
'.
+ &mt('Thank you for your request to create a new LON-CAPA account.').
+ '
';
my $now = time;
my %info = ('ip' => $ENV{'REMOTE_ADDR'},
'time' => $now,
@@ -475,12 +491,14 @@ sub send_token {
if ($result eq 'ok') {
$msg .= &mt('A message has been sent to the e-mail address you provided.').'
'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'
'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'','');
} else {
- $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')
- .' '.&mt('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 you provided.').'
'.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
} else {
- $msg .= &mt('An error occurred creating a token required for the account creation process.')
- .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= ''.
+ &mt('An error occurred creating a token required for the account creation process.').'
'.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
return $msg;
}
@@ -889,7 +907,7 @@ sub check_id {
sub invalid_state {
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
- my $msg;
+ 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.');
} elsif ($error eq 'existinguser') {
@@ -903,6 +921,7 @@ sub invalid_state {
} elsif ($error eq 'noemails') {
$msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');
}
+ $msg .= '';
if ($msgtext) {
$msg .= '
'.$msgtext;
}