--- loncom/interface/createaccount.pm 2008/07/01 16:41:57 1.7
+++ 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.7 2008/07/01 16:41:57 bisitz Exp $
+# $Id: createaccount.pm,v 1.9 2008/07/04 19:32:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ use Authen::Captcha;
use DynaLoader; # for Crypt::DES version
use Crypt::DES;
use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
sub handler {
my $r = shift;
@@ -122,9 +123,13 @@ sub handler {
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);
- if ($checkfail) {
+ ($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.');
}
@@ -181,7 +186,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)) {
@@ -314,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 .= '
';
}
@@ -438,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') {
@@ -461,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+$/) &&
@@ -668,7 +675,7 @@ sub create_account {
}
sub username_validation {
- my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid) = @_;
+ my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_;
my ($retrieved,$output,$upass);
$username= &LONCAPA::clean_username($username);
@@ -694,7 +701,8 @@ sub username_validation {
$authok = 'non_authorized';
}
if ($authok eq 'authorized') {
- ($output,undef) = &username_check($username,$domain,$domdesc,$courseid);
+ ($output,undef) = &username_check($username,$domain,$domdesc,
+ $courseid,$lonhost,$contact_email);
} else {
$output = '
'
.&mt('Username and/or password could not be authenticated.')
@@ -706,7 +714,7 @@ sub username_validation {
}
sub username_check {
- my ($username,$domain,$domdesc,$courseid) = @_;
+ my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email) = @_;
my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
$newuser = 1;
my $checkhash;
@@ -724,7 +732,7 @@ sub username_check {
&Apache::loncommon::user_rule_formats($domain,$domdesc,
$curr_rules{$domain}{'username'},'username');
if ($userchkmsg) {
- $checkfail = 1;
+ $checkfail = 'username';
}
}
return ($userchkmsg,$checkfail);
@@ -732,13 +740,26 @@ sub username_check {
}
}
my $submit_text = &mt('Create LON-CAPA account');
- # FIXME need a cookie to confirm credentials were validated.
my $output = '