--- loncom/interface/createaccount.pm 2008/07/04 19:32:56 1.9
+++ loncom/interface/createaccount.pm 2008/07/13 17:57:58 1.19
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.9 2008/07/04 19:32:56 raeburn Exp $
+# $Id: createaccount.pm,v 1.19 2008/07/13 17:57:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ use Apache::Constants qw(:common);
use Apache::lonacc;
use Apache::lonnet;
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonauth;
use Apache::resetpw;
@@ -64,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;
@@ -107,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 at this institution ([_1]).',$domdesc).'
';
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -120,23 +127,20 @@ sub handler {
if ($sso_username ne '') {
&print_header($r,$start_page);
- my ($output,$msg);
+ my ($msg,$sso_logout);
+ $sso_logout = &sso_logout_frag($r,$domain);
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,
- $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.');
- } 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.');
- }
+ $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.").' ';
+
+ $msg .= &username_check($sso_username,$domain,$domdesc,$courseid,
+ $lonhost,$contact_email,$contact_name,$sso_logout);
} 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).''.
+ $sso_logout;
}
- $r->print('
'.$msg.'
'.$output);
+ $r->print($msg);
$r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -176,25 +180,35 @@ sub handler {
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
- }
-
- &print_header($r,$start_page);
- if ($env{'form.create_with_email'}) {
+ } elsif ($env{'form.phase'} eq 'username_validation') {
+ (my $result,$output) =
+ &username_validation($r,$env{'form.uname'},$domain,$domdesc,
+ $contact_name,$contact_email,$courseid,
+ $lonhost);
+ if ($result eq 'existingaccount') {
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &print_header($r,$start_page);
+ }
+ } elsif ($env{'form.create_with_email'}) {
+ &print_header($r,$start_page);
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
$contact_name,$contact_email,\@cancreate,
$lonhost,$domconfig{'usercreation'},
$courseid);
- } elsif ($env{'form.phase'} eq 'username_validation') {
- $output = &username_validation($env{'form.uname'},$domain,$domdesc,
- $contact_name,$contact_email,$courseid,
- $lonhost);
} elsif (!$token) {
+ &print_header($r,$start_page);
my $now=time;
if (grep(/^login$/,@cancreate)) {
my $jsh=Apache::File->new($include."/londes.js");
$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);
}
@@ -277,6 +291,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(
@@ -289,8 +324,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 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',
@@ -327,7 +362,7 @@ sub print_username_form {
my $emailform = '';
my $captchaform = &create_captcha();
my $submit_text = &mt('Request LON-CAPA account');
- $output .= '';
- return ($output,'');
+ if (!$checkfail) {
+ $output = '';
+ if ($rowcount) {
+ if ($editable) {
+ $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 {
+ $msg = &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','','').' ';
+ }
+ } else {
+ $msg = ' '.&mt('Confirm that you wish to create an account.');
+ }
+ $msg .= $output;
+ }
+ return $msg;
}
sub username_activation {
@@ -864,20 +946,21 @@ 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') {
- $msg = &mt('The e-mail address you provided is already in use as a username in this LON-CAPA domain.');
+ $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 for this LON-CAPA domain do not allow the e-mail address you provided to be used as a username.');
+ $msg = &mt('Username rules for this LON-CAPA 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 in this LON-CAPA domain.');
+ $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.');
} 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 = &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;
}
@@ -890,9 +973,9 @@ sub linkto_email_help {
my $msg;
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 the [_3] domain.','','',$domdesc);
+ $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 the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+ $msg .= ' '.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).' ';
}
return $msg;
}
@@ -914,9 +997,9 @@ sub create_captcha {
sub captcha_settings {
my %captcha_params = (
- output_dir => "/home/httpd/html/captcha",
- www_output_dir => "/captcha",
- db_dir => "/home/www/captchadb",
+ output_dir => $Apache::lonnet::perlvar{'lonCaptchaDir'},
+ www_output_dir => "/captchaspool",
+ db_dir => $Apache::lonnet::perlvar{'lonCaptchaDb'},
numchars => '5',
);
return %captcha_params;
@@ -1006,4 +1089,25 @@ sub guest_format_check {
return $format_msg;
}
+sub sso_logout_frag {
+ my ($r,$domain) = @_;
+ my $endsessionmsg;
+ if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
+ my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
+ if (-e $msgfile) {
+ open(my $fh,"<$msgfile");
+ $endsessionmsg = join('',<$fh>);
+ close($fh);
+ }
+ } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
+ my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
+ if (-e $msgfile) {
+ open(my $fh,"<$msgfile");
+ $endsessionmsg = join('',<$fh>);
+ close($fh);
+ }
+ }
+ return $endsessionmsg;
+}
+
1;