--- loncom/interface/createaccount.pm 2008/07/14 08:26:57 1.20
+++ loncom/interface/createaccount.pm 2009/03/12 13:41:11 1.29
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.20 2008/07/14 08:26:57 raeburn Exp $
+# $Id: createaccount.pm,v 1.29 2009/03/12 13:41:11 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,16 +52,27 @@ sub handler {
if ($r->header_only) {
return OK;
}
-
+
my $domain;
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
+ &Apache::lonacc::get_posted_cgi($r);
+ &Apache::lonlocal::get_language_handle($r);
+
if ($sso_username ne '' && $sso_domain ne '') {
$domain = $sso_domain;
- } else {
+ } else {
$domain = &Apache::lonnet::default_login_domain();
+ if (defined($env{'form.courseid'})) {
+ if (&validate_course($env{'form.courseid'})) {
+ if ($env{'form.courseid'} =~ /^($match_domain)_($match_courseid)$/) {
+ $domain = $1;
+ }
+ }
+ }
}
my $domdesc = &Apache::lonnet::domain($domain,'description');
my $contact_name = &mt('LON-CAPA helpdesk');
@@ -74,10 +85,6 @@ sub handler {
my $include = $r->dir_config('lonIncludes');
my $start_page;
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
- &Apache::lonacc::get_posted_cgi($r);
- &Apache::lonlocal::get_language_handle($r);
-
my $handle = &Apache::lonnet::check_for_valid_session($r);
if ($handle ne '') {
$start_page =
@@ -90,35 +97,41 @@ sub handler {
return OK;
}
- my $courseid;
+ my ($js,$courseid,$title);
if (defined($env{'form.courseid'})) {
$courseid = &validate_course($env{'form.courseid'});
}
+ if ($courseid ne '') {
+ $js = &catreturn_js();
+ $title = 'Self-enroll in a LON-CAPA course';
+ } else {
+ $title = 'Create a user account in LON-CAPA';
+ }
if ($env{'form.phase'} eq 'selfenroll_login') {
+ $title = 'Self-enroll in a LON-CAPA course';
if ($env{'form.udom'} ne '') {
$domain = $env{'form.udom'};
}
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());
+ &print_footer($r);
return OK;
} else {
$start_page =
- &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course','',
+ &Apache::loncommon::start_page($title,$js,
{'no_inline_link' => 1,});
- &print_header($r,$start_page);
- $r->print($output.&Apache::loncommon::end_page());
+ &print_header($r,$start_page,$courseid);
+ $r->print($output);
+ &print_footer($r);
return OK;
}
}
-
$start_page =
- &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+ &Apache::loncommon::start_page($title,$js,
{'no_inline_link' => 1,});
my @cancreate;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
@@ -134,17 +147,17 @@ sub handler {
}
if (@cancreate == 0) {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
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());
+ &print_footer($r);
return OK;
}
if ($sso_username ne '') {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
my ($msg,$sso_logout);
$sso_logout = &sso_logout_frag($r,$domain);
if (grep(/^sso$/,@cancreate)) {
@@ -159,7 +172,7 @@ sub handler {
$sso_logout;
}
$r->print($msg);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
@@ -174,13 +187,13 @@ sub handler {
return OK;
} else {
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
} else {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
}
@@ -194,9 +207,9 @@ sub handler {
return OK;
}
}
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
} elsif ($env{'form.phase'} eq 'username_validation') {
(my $result,$output) =
@@ -205,19 +218,19 @@ sub handler {
$lonhost);
if ($result eq 'existingaccount') {
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
} else {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
}
} elsif ($env{'form.create_with_email'}) {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
$contact_name,$contact_email,\@cancreate,
$lonhost,$domconfig{'usercreation'},
$courseid);
} elsif (!$token) {
- &print_header($r,$start_page);
+ &print_header($r,$start_page,$courseid);
my $now=time;
if (grep(/^login$/,@cancreate)) {
my $jsh=Apache::File->new($include."/londes.js");
@@ -228,17 +241,21 @@ sub handler {
$r->print(&javascript_validmail());
}
$output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
- $courseid);
+ $courseid);
}
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
sub print_header {
- my ($r,$start_page) = @_;
+ my ($r,$start_page,$courseid) = @_;
$r->print($start_page);
&Apache::lonhtmlcommon::clear_breadcrumbs();
+ if ($courseid ne '') {
+ my %coursehash = &Apache::lonnet::coursedescription($courseid);
+ &selfenroll_crumbs($r,$courseid,$coursehash{'description'});
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",
text=>"New username"});
@@ -246,6 +263,42 @@ sub print_header {
return;
}
+sub print_footer {
+ my ($r) = @_;
+ if ($env{'form.courseid'} ne '') {
+ $r->print('');
+ }
+ $r->print(&Apache::loncommon::end_page());
+}
+
+sub selfenroll_crumbs {
+ my ($r,$courseid,$desc) = @_;
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:ToCatalog('backupcrumbs','')",
+ text=>"Course Catalog"});
+ if ($env{'form.coursenum'} ne '') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:ToCatalog('backupcrumbs','details')",
+ text=>"Course details"});
+ }
+ my $last_crumb;
+ if ($desc ne '') {
+ $last_crumb = &mt('Self-enroll in [_1]',''.$desc.'');
+ } else {
+ $last_crumb = &mt('Self-enroll');
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:ToSelfenroll('backupcrumbs')",
+ text=>$last_crumb,
+ no_mt=>"1"});
+ return;
+}
+
sub validate_course {
my ($courseid) = @_;
my ($cdom,$cnum) = ($courseid =~ /^($match_domain)_($match_courseid)$/);
@@ -335,7 +388,7 @@ sub print_username_form {
my %lt = &Apache::lonlocal::texthash(
unam => 'username',
udom => 'domain',
- uemail => 'Email address in LON-CAPA',
+ uemail => 'E-mail address in LON-CAPA',
proc => 'Proceed');
my $output;
if (ref($cancreate) eq 'ARRAY') {
@@ -346,36 +399,48 @@ sub print_username_form {
my $submit_text = &mt('Create LON-CAPA account');
$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.').'
'.&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,[_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 {
+ my $helpdesk = '/adm/helpdesk?origurl=%2fadm%2fcreateaccount';
+ if ($courseid ne '') {
+ $helpdesk .= '&courseid='.$courseid;
+ }
+ $output .= ''.&mt('An error occurred generating the validation code[_1] required for an e-mail address to be used as username.',' ').'
'."\n";
+ $output .= ''."\n".
''."\n".
- '';
+ '';
return $output;
}
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
$server,$settings,$courseid) = @_;
- my $useremail = $env{'form.useremail'};
+ $useremail = $env{'form.useremail'};
my $output;
if (ref($cancreate) eq 'ARRAY') {
if (!grep(/^email$/,@{$cancreate})) {
@@ -468,17 +536,13 @@ sub process_email_request {
$contact_email,$captcha_hash{$captcha_chk});
return $output;
}
- my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
if ($uhome eq 'no_host') {
- my $checkhash;
- my $checks = { 'username' => 1 };
- $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
- &Apache::loncommon::user_rule_check($checkhash,$checks,
- \%alerts,\%rulematch,\%inst_results,\%curr_rules,
- \%got_rules);
- if (ref($alerts{'useremail'}) eq 'HASH') {
- if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
+ my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+ &call_rulecheck($useremail,$domain,\%alerts,\%rulematch,
+ \%inst_results,\%curr_rules,%got_rules,'username');
+ if (ref($alerts{'username'}) eq 'HASH') {
+ if (ref($alerts{'username'}{$domain}) eq 'HASH') {
if ($alerts{'username'}{$domain}{$useremail}) {
$output = &invalid_state('userrules',$domdesc,
$contact_name,$contact_email);
@@ -503,6 +567,20 @@ sub process_email_request {
return $output;
}
+sub call_rulecheck {
+ my ($uname,$udom,$alerts,$rulematch,$inst_results,$curr_rules,
+ $got_rules,$tocheck) = @_;
+ my ($checkhash,$checks);
+ $checkhash->{$uname.':'.$udom} = { 'newuser' => 1, };
+ if ($tocheck eq 'username') {
+ $checks = { 'username' => 1 };
+ }
+ &Apache::loncommon::user_rule_check($checkhash,$checks,
+ $alerts,$rulematch,$inst_results,$curr_rules,
+ $got_rules);
+ return;
+}
+
sub send_token {
my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
my $msg = '
'.&mt('Account creation status').'
'.
@@ -517,10 +595,10 @@ sub send_token {
my $token = &Apache::lonnet::tmpput(\%info,$server);
if ($token !~ /^error/ && $token ne 'no_such_host') {
my $esc_token = &escape($token);
- my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account at the following institution: [_2].',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);
+ my $showtime = localtime(time);
+ my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account at the following institution: [_2].',$showtime,$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);
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
$contact_email);
if ($result eq 'ok') {
@@ -608,7 +686,7 @@ sub start_session {
$courseid = &validate_course($courseid);
if ($courseid ne '') {
$form{'courseid'} = $courseid;
- $firsturl = '/adm/selfenroll?cid='.$courseid;
+ $firsturl = '/adm/selfenroll?courseid='.$courseid;
}
}
if ($r->dir_config('lonBalancer') eq 'yes') {
@@ -649,7 +727,7 @@ sub print_dataentry_form {
'lastname' => "Last Name",
'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",
- 'id' => "ID/Student Number",
+ 'id' => "Student/Employee ID",
'lg' => "Login Data"
);
my %textboxsize = (
@@ -730,7 +808,7 @@ sub create_account {
&mt('Return to previous page').''.
&Apache::loncommon::end_page();
if ($retrieved eq 'ok') {
- if ($env{'form.cid'} ne '') {
+ if ($env{'form.courseid'} ne '') {
my ($result,$userchkmsg) = &check_id($username,$domain,$domdesc);
if ($result eq 'fail') {
$output = $error.&mt('Invalid ID format').$end.
@@ -775,10 +853,7 @@ sub username_validation {
$output = '
'.&mt('A LON-CAPA account already exists for username [_1] at this institution ([_2]).',''.$username.'',$domdesc).' '.&mt('The password entered was also correct so you have been logged in.');
return ('existingaccount',$output);
} else {
- $output = '
'.
- &mt('Username and/or password could not be authenticated.').
- '
'.
- &mt('Please check the username and password.');
+ $output = &login_failure_msg($courseid);
}
} else {
my $primlibserv = &Apache::lonnet::domain($domain,'primary');
@@ -795,26 +870,35 @@ sub username_validation {
$output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
$contact_email,$contact_name);
} else {
- $output = '
'.
- &mt('Username and/or password could not be authenticated.').
- '
'.
- &mt('Please check the username and password.');
+ $output = &login_failure_msg($courseid);
}
}
return ('ok',$output);
}
+sub login_failure_msg {
+ my ($courseid) = @_;
+ my $url;
+ if ($courseid ne '') {
+ $url = "/adm/selfenroll?courseid=".$courseid;
+ } else {
+ $url = "/adm/createaccount";
+ }
+ my $output = '
'.&mt('Authentication failed').'
'.
+ &mt('Username and/or password could not be authenticated.').
+ '
'.
+ &mt('Please check the username and password.').'
';
+ ''.&mt('Try again').'';
+ return $output;
+}
+
sub username_check {
my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
$sso_logout) = @_;
- my (%rulematch,%inst_results,$newuser,$checkfail,$rowcount,$editable,$output,$msg,
+ my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg,
%alerts,%curr_rules,%got_rules);
- $newuser = 1;
- my $checkhash;
- my $checks = { 'username' => 1 };
- $checkhash->{$username.':'.$domain} = { 'newuser' => $newuser };
- &Apache::loncommon::user_rule_check($checkhash,$checks,\%alerts,\%rulematch,
- \%inst_results,\%curr_rules,\%got_rules);
+ &call_rulecheck($username,$domain,\%alerts,\%rulematch,
+ \%inst_results,\%curr_rules,%got_rules,'username');
if (ref($alerts{'username'}) eq 'HASH') {
if (ref($alerts{'username'}{$domain}) eq 'HASH') {
if ($alerts{'username'}{$domain}{$username}) {
@@ -877,12 +961,21 @@ sub username_check {
&mt('Create LON-CAPA account').'" />';
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.','','').' ';
+ if ($courseid ne '') {
+ $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 {
- $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.','','').' ';
+ if ($courseid ne '') {
+ $msg = '
'.&mt('Review user information').'
';
+ }
+ $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.');
+ if ($courseid ne '') {
+ $msg = '
'.&mt('Confirmation').'
';
+ }
+ $msg .= &mt('Confirm that you wish to create an account.');
}
$msg .= $output;
}
@@ -922,7 +1015,7 @@ sub username_activation {
if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) &&
($domdefaults{'auth_arg_def'} ne '')) ||
($domdefaults{'auth_def'} eq 'localauth')) {
- if ($env{'form.cid'} ne '') {
+ if ($env{'form.courseid'} ne '') {
my ($result,$userchkmsg) = &check_id($username,$domain,$domdesc);
if ($result eq 'fail') {
$output = $error.&mt('Invalid ID format').$end.
@@ -931,13 +1024,32 @@ sub username_activation {
}
}
# Call modifyuser
+ my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info);
+ &call_rulecheck($username,$domain,\%alerts,\%rulematch,
+ \%inst_results,\%curr_rules,%got_rules);
+ my @userinfo = ('firstname','middlename','lastname','generation',
+ 'permanentemail','id');
+ my %canmodify =
+ &Apache::loncreateuser::selfcreate_canmodify('selfcreate',$domain,
+ \@userinfo,\%inst_results);
+ foreach my $item (@userinfo) {
+ if ($canmodify{$item}) {
+ $info{$item} = $env{'form.c'.$item};
+ } else {
+ $info{$item} = $inst_results{$username.':'.$domain}{$item};
+ }
+ }
+ if (ref($inst_results{$username.':'.$domain}{'inststatus'}) eq 'ARRAY') {
+ my @inststatuses = @{$inst_results{$username.':'.$domain}{'inststatus'}};
+ $info{'inststatus'} = join(':',map { &escape($_); } @inststatuses);
+ }
my $result =
&Apache::lonnet::modifyuser($domain,$username,$env{'form.cid'},
$domdefaults{'auth_def'},
- $domdefaults{'auth_arg_def'},$env{'form.cfirstname'},
- $env{'form.cmiddlename'},$env{'form.clastname'},
- $env{'form.cgeneration'},undef,undef,
- $env{'form.cpermanentemail'});
+ $domdefaults{'auth_arg_def'},$info{'firstname'},
+ $info{'middlename'},$info{'lastname'},
+ $info{'generation'},undef,undef,
+ $info{'permanentemail'},$info{'inststatus'});
if ($result eq 'ok') {
my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'});
$output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain);
@@ -991,7 +1103,7 @@ sub invalid_state {
} 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.');
} elsif ($error eq 'userrules') {
- $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.');
+ $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.');
} elsif ($error eq 'captcha') {
@@ -1022,15 +1134,23 @@ sub linkto_email_help {
sub create_captcha {
my ($output_dir,$db_dir) = @_;
my %captcha_params = &captcha_settings();
- my $captcha = Authen::Captcha->new(
- output_folder => $captcha_params{'output_dir'},
- data_folder => $captcha_params{'db_dir'},
- );
- my $md5sum = $captcha->generate_code($captcha_params{'numchars'});
- my $output = ''."\n".
- &mt('Type in the letters/numbers shown below').' '.
- ' '.
- '';
+ my ($output,$maxtries,$tries) = ('',10,0);
+ while ($tries < $maxtries) {
+ $tries ++;
+ my $captcha = Authen::Captcha->new (
+ output_folder => $captcha_params{'output_dir'},
+ data_folder => $captcha_params{'db_dir'},
+ );
+ my $md5sum = $captcha->generate_code($captcha_params{'numchars'});
+
+ if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') {
+ $output = ''."\n".
+ &mt('Type in the letters/numbers shown below').' '.
+ ' '.
+ '';
+ last;
+ }
+ }
return $output;
}
@@ -1056,11 +1176,15 @@ sub getkeys {
sub serverform {
my ($logtoken,$lonhost,$mailtoken,$courseid,$context) = @_;
- my $phase = 'username_validation"';
+ my $phase = 'username_validation';
+ my $catalog_elements;
if ($context eq 'selfenroll') {
$phase = 'selfenroll_login';
}
- my $output .= <
@@ -1069,6 +1193,7 @@ sub serverform {
+ $catalog_elements
ENDSERVERFORM
return $output;
@@ -1153,4 +1278,61 @@ sub sso_logout_frag {
return $endsessionmsg;
}
+sub catreturn_js {
+ return <<"ENDSCRIPT";
+
+ENDSCRIPT
+
+}
+
1;