'.$end_page);
return OK;
}
my ($js,$courseid,$title);
- if (defined($env{'form.courseid'})) {
- $courseid = &validate_course($env{'form.courseid'});
- }
+ $courseid = Apache::lonnet::is_course($env{'form.courseid'});
if ($courseid ne '') {
$js = &catreturn_js();
$title = 'Self-enroll in a LON-CAPA course';
@@ -112,45 +122,63 @@ sub handler {
if ($env{'form.udom'} ne '') {
$domain = $env{'form.udom'};
}
+
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+ my ($cancreate,$statustocreate) =
+ &get_creation_controls($domain,$domconfig{'usercreation'});
+
my ($result,$output) =
&username_validation($r,$env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$courseid,
- $lonhost);
- if ($result eq 'existingaccount') {
+ $lonhost,$statustocreate);
+ if ($result eq 'redirect') {
+ $r->internal_redirect('/adm/switchserver');
+ return OK;
+ } elsif ($result eq 'existingaccount') {
$r->print($output);
&print_footer($r);
return OK;
} else {
- $start_page =
- &Apache::loncommon::start_page($title,$js,
- {'no_inline_link' => 1,});
+ $start_page = &Apache::loncommon::start_page($title,$js);
&print_header($r,$start_page,$courseid);
$r->print($output);
&print_footer($r);
return OK;
}
}
- $start_page =
- &Apache::loncommon::start_page($title,$js,
- {'no_inline_link' => 1,});
- my @cancreate;
- my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
- if (ref($domconfig{'usercreation'}) eq 'HASH') {
- if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
- if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
- @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}};
- } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') &&
- ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) {
- @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'});
+
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+ my ($cancreate,$statustocreate,$statusforemail,$emailusername,
+ $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle) =
+ &get_creation_controls($domain,$domconfig{'usercreation'});
+ my ($additems,$pagetitle);
+ if (ref($cancreate) eq 'ARRAY') {
+ unless (($env{'form.token'}) || ($sso_username ne '') || ($env{'form.phase'}) ||
+ ($env{'form.create_with_email'})) {
+ if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) {
+ my $usertype = &get_usertype($domain);
+ if ((($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) &&
+ (@{$statusforemail} > 0)) {
+ $js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle);
+ $additems = {'add_entries' => { 'onload' => "setElements();"} };
+ if ((@{$cancreate} == 1) && (@{$statusforemail} > 0)) {
+ $pagetitle = 'Select affiliation';
+ }
+ } else {
+ $js .= &username_js();
+ }
}
}
}
-
- if (@cancreate == 0) {
- &print_header($r,$start_page,$courseid);
+ $start_page = &Apache::loncommon::start_page($title,$js,$additems);
+ if (@{$cancreate} == 0) {
+ &print_header($r,$start_page,$courseid,$pagetitle);
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).'
';
+ &mt('Creation of a new user account using an institutional log-in ID or e-mail verification is not permitted for: [_1].',$domdesc).
+ '
';
$r->print($output);
&print_footer($r);
return OK;
@@ -160,12 +188,40 @@ sub handler {
&print_header($r,$start_page,$courseid);
my ($msg,$sso_logout);
$sso_logout = &sso_logout_frag($r,$domain);
- if (grep(/^sso$/,@cancreate)) {
+ if (grep(/^sso$/,@{$cancreate})) {
$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.").' ';
-
+ my $shibenv;
+ if (($r->dir_config('lonOtherAuthen') eq 'yes') &&
+ ($r->dir_config('lonOtherAuthenType') eq 'Shibboleth')) {
+ if (ref($domconfig{'usercreation'}) eq 'HASH') {
+ if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+ if (ref($domconfig{'usercreation'}{'cancreate'}{'shibenv'}) eq 'HASH') {
+ my @possfields = ('firstname','middlename','lastname','generation',
+ 'permanentemail','id');
+ $shibenv= {};
+ foreach my $key (keys(%{$domconfig{'usercreation'}{'cancreate'}{'shibenv'}})) {
+ if ($key eq 'inststatus') {
+ if (ref($usertypes) eq 'HASH') {
+ if ($domconfig{'usercreation'}{'cancreate'}{'shibenv'}{$key} ne '') {
+ if (exists($usertypes->{$domconfig{'usercreation'}{'cancreate'}{'shibenv'}{$key}})) {
+ $shibenv->{$key} = $domconfig{'usercreation'}{'cancreate'}{'shibenv'}{$key};
+ }
+ }
+ }
+ } elsif (grep(/^\Q$key\E/,@possfields)) {
+ if ($domconfig{'usercreation'}{'cancreate'}{'shibenv'}{$key} ne '') {
+ $shibenv->{$key} = $domconfig{'usercreation'}{'cancreate'}{'shibenv'}{$key};
+ }
+ }
+ }
+ }
+ }
+ }
+ }
$msg .= &username_check($sso_username,$domain,$domdesc,$courseid,
- $lonhost,$contact_email,$contact_name,$sso_logout);
+ $lonhost,$contact_email,$contact_name,
+ $sso_logout,$statustocreate,$shibenv);
} else {
$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).''.
@@ -176,13 +232,17 @@ sub handler {
return OK;
}
- my ($output,$nostart,$noend);
+ my ($output,$nostart,$noend,$redirect);
my $token = $env{'form.token'};
if ($token) {
- ($output,$nostart,$noend) =
+ ($output,$nostart,$noend,$redirect) =
&process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
- $domdesc,$lonhost,$include,$start_page);
- if ($nostart) {
+ $domdesc,$lonhost,$include,$start_page,$cancreate,
+ $domconfig{'usercreation'},$types);
+ if ($redirect) {
+ $r->internal_redirect('/adm/switchserver');
+ return OK;
+ } elsif ($nostart) {
if ($noend) {
return OK;
} else {
@@ -197,12 +257,43 @@ sub handler {
return OK;
}
}
-
+ my ($usernameset,$condition,$excluded,$hascustom);
+ if ((grep(/^email$/,@{$cancreate})) && (($env{'form.create_with_email'}) ||
+ ((!$token) && ($env{'form.phase'} eq '')))) {
+ my $usertype = &get_usertype($domain);
+ if ($usertype eq '') {
+ $usertype = 'default';
+ }
+ if (ref($verification) eq 'HASH') {
+ if ($verification->{$usertype} =~ /^(free|first)$/) {
+ $usernameset = $verification->{$usertype};
+ }
+ }
+ if (ref($emailoptions) eq 'HASH') {
+ if ($emailoptions->{$usertype} =~ /^(inst|noninst)$/) {
+ my $chosen = $1;
+ if (ref($emaildomain) eq 'HASH') {
+ if (ref($emaildomain->{$usertype}) eq 'HASH') {
+ if ($chosen eq 'inst') {
+ $condition = $emaildomain->{$usertype}->{$chosen};
+ } else {
+ $excluded = $emaildomain->{$usertype}->{$chosen};
+ }
+ }
+ }
+ } elsif ($emailoptions->{$usertype} eq 'custom') {
+ $hascustom = 1;
+ }
+ }
+ }
if ($env{'form.phase'} eq 'username_activation') {
(my $result,$output,$nostart) =
&username_activation($r,$env{'form.uname'},$domain,$domdesc,
- $lonhost,$courseid);
- if ($result eq 'ok') {
+ $courseid);
+ if ($result eq 'redirect') {
+ $r->internal_redirect('/adm/switchserver');
+ return OK;
+ } elsif ($result eq 'ok') {
if ($nostart) {
return OK;
}
@@ -215,7 +306,7 @@ sub handler {
(my $result,$output) =
&username_validation($r,$env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$courseid,
- $lonhost);
+ $lonhost,$statustocreate);
if ($result eq 'existingaccount') {
$r->print($output);
&print_footer($r);
@@ -225,23 +316,35 @@ sub handler {
}
} elsif ($env{'form.create_with_email'}) {
&print_header($r,$start_page,$courseid);
- $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
- $contact_name,$contact_email,\@cancreate,
+ my $usertype = &get_usertype($domain);
+ if ($usertype eq '') {
+ $usertype = 'default';
+ }
+ $output = &process_email_request($env{'form.uname'},$domain,$domdesc,
+ $contact_name,$contact_email,$cancreate,
$lonhost,$domconfig{'usercreation'},
- $courseid);
+ $emailusername,$courseid,$usertype,
+ $usernameset,$condition,$excluded,$hascustom);
} elsif (!$token) {
- &print_header($r,$start_page,$courseid);
+ &print_header($r,$start_page,$courseid,$pagetitle);
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(/^login$/,@{$cancreate})) && (!grep(/^email$/,@{$cancreate}))) {
+ if (open(my $jsh,"<","$include/londes.js")) {
+ while(my $line = <$jsh>) {
+ $r->print($line);
+ }
+ close($jsh);
+ $r->print(&javascript_setforms($now));
+ }
}
- if (grep(/^email$/,@cancreate)) {
- $r->print(&javascript_validmail());
+ if (grep(/^email$/,@{$cancreate})) {
+ $r->print(&javascript_validmail($condition));
}
- $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
- $courseid);
+ my $usertype = &get_usertype($domain);
+ $output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost,
+ $include,$courseid,$emailusername,
+ $statusforemail,$usernameset,$condition,
+ $excluded,$usertype,$types,$usertypes,$othertitle);
}
$r->print($output);
&print_footer($r);
@@ -249,16 +352,25 @@ sub handler {
}
sub print_header {
- my ($r,$start_page,$courseid) = @_;
+ my ($r,$start_page,$courseid,$pagetitle) = @_;
$r->print($start_page);
&Apache::lonhtmlcommon::clear_breadcrumbs();
+ my $url = '/adm/createaccount';
+ if ($pagetitle eq '') {
+ $pagetitle = 'New username';
+ }
if ($courseid ne '') {
my %coursehash = &Apache::lonnet::coursedescription($courseid);
&selfenroll_crumbs($r,$courseid,$coursehash{'description'});
}
+ if ($env{'form.reportedtype'}) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>$url,
+ text=>"Select affiliation"});
+ }
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/createuser",
- text=>"New username"});
+ ({href=>$url,
+ text=>$pagetitle});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
return;
}
@@ -269,18 +381,34 @@ sub print_footer {
$r->print('');
}
$r->print(&Apache::loncommon::end_page());
}
+sub get_usertype {
+ my ($domain) = @_;
+ my $usertype;
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($domain);
+ if (ref($types) eq 'ARRAY') {
+ push(@{$types},'default');
+ my $posstype = $env{'form.type'};
+ $posstype =~ s/^\s+|\s$//g;
+ if (grep(/^\Q$posstype\E$/,@{$types})) {
+ $usertype = $posstype;
+ }
+ }
+ return $usertype;
+}
+
sub selfenroll_crumbs {
my ($r,$courseid,$desc) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('backupcrumbs','')",
- text=>"Course Catalog"});
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('backupcrumbs','details')",
@@ -288,7 +416,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');
}
@@ -299,155 +427,300 @@ sub selfenroll_crumbs {
return;
}
-sub validate_course {
- my ($courseid) = @_;
- my ($cdom,$cnum) = ($courseid =~ /^($match_domain)_($match_courseid)$/);
- if (($cdom ne '') && ($cnum ne '')) {
- if (&Apache::lonnet::is_course($cdom,$cnum)) {
- return ($courseid);
+sub javascript_setforms {
+ my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
+ my ($setuserinfo,@required,$requiredchk);
+ if (ref($emailusername) eq 'HASH') {
+ if (ref($emailusername->{$usertype}) eq 'HASH') {
+ foreach my $key (sort(keys(%{$emailusername->{$usertype}}))) {
+ if ($emailusername->{$usertype}{$key} eq 'required') {
+ push(@required,$key);
+ }
+ $setuserinfo .= ' server.elements.'.$key.'.value=client.elements.'.$key.'.value;'."\n";
+ }
+ $setuserinfo .= ' server.elements.type.value=client.elements.type.value;'."\n";
+ }
+ if ($captcha eq 'original') {
+ $setuserinfo .= ' server.elements.code.value=client.elements.code.value;'."\n".
+ ' server.elements.crypt.value=client.elements.crypt.value;'."\n";
+ } elsif ($captcha eq 'recaptcha') {
+ if ($recaptchaversion ne '2') {
+ $setuserinfo .=
+ ' server.elements.recaptcha_challenge_field.value=client.elements.recaptcha_challenge_field.value;'."\n".
+ ' server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n";
+ }
+ }
+ if ($usernameset eq 'free') {
+ $setuserinfo .=
+ ' server.elements.username.value=client.elements.username.value;'."\n";
}
}
- return;
-}
+ if (@required) {
+ my $missprompt = &mt('One or more required fields are currently blank.');
+ &js_escape(\$missprompt);
+ my $reqstr = join("','",@required);
+ $requiredchk = <<"ENDCHK";
+ var requiredfields = new Array('$reqstr');
+ missing = 0;
+ for (var i=0; i 0) {
+ alert("$missprompt");
+ return false;
+ }
-sub javascript_setforms {
- my ($now) = @_;
+ENDCHK
+ }
my $js = <
- function send() {
- this.document.server.elements.uname.value = this.document.client.elements.uname.value;
- this.document.server.elements.udom.value = this.document.client.elements.udom.value;
- uextkey=this.document.client.elements.uextkey.value;
- lextkey=this.document.client.elements.lextkey.value;
- initkeys();
-
- this.document.server.elements.upass.value
- = crypted(this.document.client.elements.upass$now.value);
-
- this.document.client.elements.uname.value='';
- this.document.client.elements.upass$now.value='';
-
- this.document.server.submit();
+
+
+// ]]>
+
ENDSCRIPT
+ if (($captcha eq 'recaptcha') && ($recaptchaversion eq '2')) {
+ $js .= "\n".''."\n";
+ }
return $js;
}
sub javascript_checkpass {
- my ($now) = @_;
+ my ($now,$context,$domain) = @_;
my $nopass = &mt('You must enter a password.');
- my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.
+ my $mismatchpass = &mt('The passwords you entered did not match.')."\n".
&mt('Please try again.');
+ my ($numrules,$intargjs) =
+ &Apache::lonuserutils::passwd_validation_js('upass',$domain);
+ &js_escape(\$nopass);
+ &js_escape(\$mismatchpass);
my $js = <<"ENDSCRIPT";
-
ENDSCRIPT
return $js;
}
sub javascript_validmail {
- my %lt = &Apache::lonlocal::texthash (
+ my ($condition) = @_;
+ my %js_lt = &Apache::lonlocal::texthash (
email => 'The e-mail address you entered',
notv => 'is not a valid e-mail address',
+ avae => 'A valid e-mail address is not formed when the value you entered',
+ isco => 'is combined with the required domain',
);
my $output = "\n".''."\n";
+ $output .= "\n".'// ]]>'."\n".''."\n";
return $output;
}
sub print_username_form {
- my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
- my %lt = &Apache::lonlocal::texthash(
- unam => 'username',
- udom => 'domain',
- uemail => 'E-mail address in LON-CAPA',
- proc => 'Proceed');
+ my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername,
+ $statusforemail,$usernameset,$condition,$excluded,$usertype,$types,$usertypes,
+ $othertitle) = @_;
+ my %lt = &Apache::lonlocal::texthash (
+ crac => 'Create account with a username provided by this institution',
+ clca => 'Create LON-CAPA account',
+ type => 'Type in your log-in ID and password to find out.',
+ plse => 'Please provide a password for your new account.',
+ info => 'Please provide user information and a password for your new account.',
+ yopw => 'Your password will be encrypted when sent (and stored).',
+ crae => 'Create account using e-mail address verification',
+ );
my $output;
if (ref($cancreate) eq 'ARRAY') {
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 this institution').'
';
- 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.').'
';
}
}
if (grep(/^email$/,@{$cancreate})) {
- $output .= '
'.&mt('Create account with an e-mail address as your username').'
';
- my $captchaform = &create_captcha();
- if ($captchaform) {
- my $submit_text = &mt('Request LON-CAPA account');
- my $emailform = '';
- 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.',' ').'
';
}
}
if ($output eq '') {
- $output = &mt('Creation of a new LON-CAPA user account using an e-mail address or an institutional log-in ID as your username is not permitted at [_1].',$domdesc);
+ $output = &mt('Creation of a new LON-CAPA user account using an institutional log-in ID or verification by e-mail is not permitted at [_1].',$domdesc);
} else {
$output .= '';
}
@@ -461,14 +734,14 @@ sub login_box {
createaccount => 'Log-in ID',
selfenroll => 'Username',
);
- my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+ my ($lkey,$ukey) = &Apache::loncommon::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
- my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+ my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
$lonhost);
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
- my $unameform = '';
- my $upassform = '';
- $output .= '';
return $output;
}
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
- $server,$settings,$courseid) = @_;
- $useremail = $env{'form.useremail'};
- my $output;
+ $server,$settings,$emailusername,$courseid,$usertype,$usernameset,
+ $condition,$excluded,$hascustom) = @_;
+ my ($output,$uname);
if (ref($cancreate) eq 'ARRAY') {
if (!grep(/^email$/,@{$cancreate})) {
$output = &invalid_state('noemails',$domdesc,
$contact_name,$contact_email);
return $output;
- } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+ } elsif ((($condition ne '') && ($useremail !~ /^[^\@]+$/)) ||
+ (($condition eq '') && ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
$output = &invalid_state('baduseremail',$domdesc,
$contact_name,$contact_email);
return $output;
} else {
- my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
+ $useremail =~ s/^\s+|\s+$//g;
+ my $possuname;
+ if ($condition ne '') {
+ if ($usernameset eq 'first') {
+ $possuname = $useremail;
+ }
+ $useremail .= $condition;
+ } elsif ($excluded ne '') {
+ if ($useremail =~ /^[^\@]+\Q$excluded\E$/) {
+ $output = &invalid_state('userrules',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
+ }
+ }
+ if (($usernameset eq 'free') && ($env{'form.username'} ne '')) {
+ $possuname = $env{'form.username'};
+ } elsif (($usernameset eq 'first') && ($condition eq '')) {
+ if ($condition eq '') {
+ ($possuname) = ($useremail =~ /^([^\@]+)\@/);
+ }
+ }
+ if ($possuname ne '') {
+ $possuname =~ s/^\s+|\s+$//g;
+ if ($possuname ne '') {
+ $uname=&LONCAPA::clean_username($possuname);
+ if ($uname ne $possuname) {
+ $output = &invalid_state('badusername',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
+ }
+ }
+ }
+ if ($possuname eq '') {
+ $uname=&LONCAPA::clean_username($useremail);
+ if ($useremail ne $uname) {
+ $output = &invalid_state('badusername',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
+ }
+ }
+ my $uhome = &Apache::lonnet::homeserver($uname,$domain);
if ($uhome ne 'no_host') {
$output = &invalid_state('existinguser',$domdesc,
$contact_name,$contact_email);
return $output;
} else {
- my $code = $env{'form.code'};
- my $md5sum = $env{'form.crypt'};
- my %captcha_params = &captcha_settings();
- my $captcha = Authen::Captcha->new(
- output_folder => $captcha_params{'output_dir'},
- data_folder => $captcha_params{'db_dir'},
- );
- my $captcha_chk = $captcha->check_code($code,$md5sum);
- my %captcha_hash = (
- 0 => 'Code not checked (file error)',
- -1 => 'Failed: code expired',
- -2 => 'Failed: invalid code (not in database)',
- -3 => 'Failed: invalid code (code does not match crypt)',
- );
+ my ($captcha_chk,$captcha_error) = &Apache::loncommon::captcha_response('usercreation',$server);
if ($captcha_chk != 1) {
- $output = &invalid_state('captcha',$domdesc,$contact_name,
- $contact_email,$captcha_hash{$captcha_chk});
+ $output = ''.
+ &mt('Validation of the code you entered failed.').''.
+ ' '.$captcha_error."\n".'
'.
+ &mt('[_1]Return[_2] to the previous page to try again.',
+ '','')."\n".
+ '
'.
+ ''."\n";
+ if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
+ $output .= ''."\n";
+ }
+ if ($env{'form.type'}) {
+ my $usertype = &get_usertype($domain);
+ if ($usertype ne '') {
+ $output .= ''."\n".
+ ''."\n";
+ }
+ }
+ $output .= '';
return $output;
}
- my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
- if ($uhome eq 'no_host') {
- 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);
- return $output;
- }
+ my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+ &call_rulecheck($uname,$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}{$uname}) {
+ $output = &invalid_state('userrules',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
}
}
+ }
+ if ($hascustom) {
my $format_msg =
&guest_format_check($useremail,$domain,$cancreate,
- $settings);
+ $settings,$usertype);
if ($format_msg) {
$output = &invalid_state('userformat',$domdesc,$contact_name,
$contact_email,$format_msg);
@@ -571,7 +887,8 @@ sub process_email_request {
}
}
$output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
- $contact_email,$courseid);
+ $contact_email,$courseid,$emailusername,$usertype,
+ $uname);
}
return $output;
}
@@ -591,87 +908,225 @@ sub call_rulecheck {
}
sub send_token {
- my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
+ my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid,$emailusername,
+ $usertype,$uname) = @_;
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,
- 'domain' => $domain,
- 'username' => $email,
- 'courseid' => $courseid);
- my $token = &Apache::lonnet::tmpput(\%info,$server);
- if ($token !~ /^error/ && $token ne 'no_such_host') {
- my $esc_token = &escape($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') {
- $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.",'','');
+ $env{'form.logtoken'} =~ s/(`)//g;
+ if ($env{'form.logtoken'}) {
+ my $logtoken = $env{'form.logtoken'};
+ my $earlyout;
+ my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$server);
+ if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
+ $msg = &mt('Information needed to process your request is missing, inaccessible or expired.')
+ .'
'.&mt('[_1]Return[_2] to the previous page to try again.',
+ '','');
+ $earlyout = 1;
+ } else {
+ my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$server);
+ unless ($reply eq 'ok') {
+ $msg .= &mt('Request could not be processed.');
+ }
+ }
+# Check if the password entered by the user satisfies domain's requirements
+ my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
+ my ($min,$max,@chars);
+ $min = $Apache::lonnet::passwdmin;
+ if (ref($passwdconf{'chars'}) eq 'ARRAY') {
+ if ($passwdconf{'min'} =~ /^\d+$/) {
+ if ($passwdconf{'min'} > $min) {
+ $min = $passwdconf{'min'};
+ }
+ }
+ if ($passwdconf{'max'} =~ /^\d+$/) {
+ $max = $passwdconf{'max'};
+ }
+ @chars = @{$passwdconf{'chars'}};
+ }
+ my $encpass = $env{'form.upass'};
+ if ($encpass eq '') {
+ $msg = &mt('Password retrieved was blank.').
+ '
'.&mt('[_1]Return[_2] to the previous page to try again.',
+ '','');
+ $earlyout = 1;
+ } else {
+# Split the logtoken to retrieve the DES key and decrypt the encypted password
+ my ($key,$caller)=split(/&/,$tmpinfo);
+ if ($caller eq 'createaccount') {
+ my $plainpass = &Apache::loncommon::des_decrypt($key,$encpass);
+ if (($min > 0) || ($max ne '') || (@chars > 0)) {
+ my $warning = &Apache::loncommon::check_passwd_rules($domain,$plainpass);
+ if ($warning) {
+ $msg = $warning.
+ '
'.&mt('[_1]Return[_2] to the previous page to try again.',
+ '','');
+ $earlyout = 1;
+ }
+ }
+ }
+ }
+ if ($earlyout) {
+ $msg .= '
'.
+ ''."\n";
+ if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
+ $msg .= ''."\n";
+ }
+ if ($env{'form.type'}) {
+ my $usertype = &get_usertype($domain);
+ if ($usertype ne '') {
+ $msg .= ''.
+ ''."\n";
+ }
+ }
+ $msg .= '';
+ return $msg;
+ }
+ my %info = ('ip' => $ENV{'REMOTE_ADDR'},
+ 'time' => $now,
+ 'domain' => $domain,
+ 'username' => $email,
+ 'courseid' => $courseid,
+ 'upass' => $env{'form.upass'},
+ 'serverid' => $env{'form.serverid'},
+ 'tmpinfo' => $tmpinfo);
+ if ($uname ne '') {
+ $info{'username'} = $uname;
+ $info{'email'} = $email;
+ }
+ if (ref($emailusername) eq 'HASH') {
+ if (ref($emailusername->{$usertype}) eq 'HASH') {
+ foreach my $item (keys(%{$emailusername->{$usertype}})) {
+ $info{$item} = $env{'form.'.$item};
+ $info{$item} =~ s/(`)//g;
+ }
+ }
+ }
+ if ($usertype ne '') {
+ $info{'usertype'} = $usertype;
+ }
+ my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount');
+ if ($token !~ /^error/ && $token ne 'no_such_host') {
+ my $esc_token = &escape($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') {
+ $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);
+ }
} else {
$msg .= ''.
- &mt('An error occurred when sending a message to the e-mail address you provided.').' '.
+ &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);
}
} 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 .= $msg = &mt('Information needed to process your request is missing, inaccessible or expired.')
+ .' '.&mt('Return to the previous page to try again.');
+
}
return $msg;
}
sub process_mailtoken {
my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
- $include,$start_page) = @_;
- my ($msg,$nostart,$noend);
+ $include,$start_page,$cancreate,$settings,$types) = @_;
+ my ($msg,$nostart,$noend,$redirect);
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.')
.' '.&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.','','');
+ .' '.&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+$/) &&
($data{'domain'} ne '') &&
- ($data{'username'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/)) {
+ ((($data{'email'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && ($data{'username'} =~ /^$match_username$/)) ||
+ ($data{'username'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
if ($now - $data{'time'} < 7200) {
- if ($env{'form.phase'} eq 'createaccount') {
- my ($result,$output) = &create_account($r,$domain,$lonhost,
- $data{'username'},$domdesc);
- if ($result eq 'ok') {
- $msg = $output;
- my $shownow = &Apache::lonlocal::locallocaltime($now);
- my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
- my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
- $mailmsg,$contact_name,
- $contact_email);
- if ($mailresult eq 'ok') {
- $msg .= &mt('An e-mail confirming creation of your new LON-CAPA account has been sent to [_1].',$data{'username'});
+# Check if request should be queued.
+ if (ref($cancreate) eq 'ARRAY') {
+ my ($disposition,$usertype);
+ if (grep(/^email$/,@{$cancreate})) {
+ if (exists($data{'usertype'})) {
+ $usertype = $data{'usertype'};
+ my @posstypes;
+ if (ref($types) eq 'ARRAY') {
+ @posstypes = @{$types};
+ if (@posstypes) {
+ unless (grep(/^default$/,@posstypes)) {
+ push(@posstypes,'default');
+ }
+ }
+ if (grep(/\Q$usertype\E/,@posstypes)) {
+ unless ($usertype eq 'default') {
+ $data{'inststatus'} = $usertype;
+ }
+ } else {
+ $disposition = 'approval';
+ }
+ }
+ delete($data{'usertype'});
+ }
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{'cancreate'}) eq 'HASH') {
+ if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
+ if ($usertype ne '') {
+ $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype};
+ unless ($disposition =~ /^(approval|automatic)$/) {
+ $disposition = 'approval';
+ }
+ }
+ }
+ }
+ }
+ if ($disposition eq 'approval') {
+ $msg = &store_request($domain,$data{'username'},'approval',\%data,$settings);
+ my $delete = &Apache::lonnet::tmpdel($token);
} else {
- $msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
+ my ($result,$output,$uhome) =
+ &create_account($r,$domain,$domdesc,\%data);
+ if ($result eq 'ok') {
+ $msg = $output;
+ my $shownow = &Apache::lonlocal::locallocaltime($now);
+ my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+ my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
+ $mailmsg,$contact_name,
+ $contact_email);
+ if ($mailresult eq 'ok') {
+ $msg .= &mt('An e-mail confirming creation of your new LON-CAPA account has been sent to [_1].',$data{'username'});
+ } else {
+ $msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
+ }
+ $redirect = &start_session($r,$data{'username'},$domain,$uhome,
+ $data{'courseid'},$token);
+ $nostart = 1;
+ $noend = 1;
+ } else {
+ $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
+ .' '.$output;
+ if (($contact_name ne '') && ($contact_email ne '')) {
+ $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ }
+ }
+ my $delete = &Apache::lonnet::tmpdel($token);
}
- my %form = &start_session($r,$data{'username'},$domain,
- $lonhost,$data{'courseid'},
- $token);
- $nostart = 1;
- $noend = 1;
} else {
- $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
- .' '.$output
-# .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,''.$contact_email.'');
- .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg = &invalid_state('noemails',$domdesc,$contact_name,$contact_email);
}
- my $delete = &Apache::lonnet::tmpdel($token);
} else {
- $msg .= &mt('Please provide user information and a password for your new account.').' '.&mt('Your password, which must contain at least seven characters, will be sent to the LON-CAPA server in an encrypted form.').' ';
- $msg .= &print_dataentry_form($r,$domain,$lonhost,$include,$token,$now,$data{'username'},$start_page);
- $nostart = 1;
+ $msg = &invalid_state('noemails',$domdesc,$contact_name,$contact_email);
}
} else {
$msg = &mt('Sorry, the token generated when you requested creation of an account has expired.')
@@ -681,107 +1136,112 @@ sub process_mailtoken {
$msg .= &mt('Sorry, the URL generated when you requested creation of an account contained incomplete information.')
.' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','','');
}
- return ($msg,$nostart,$noend);
+ return ($msg,$nostart,$noend,$redirect);
}
sub start_session {
- my ($r,$username,$domain,$lonhost,$courseid,$token) = @_;
- my %form = (
- uname => $username,
- udom => $domain,
- );
- my $firsturl = '/adm/roles';
- if (defined($courseid)) {
- $courseid = &validate_course($courseid);
- if ($courseid ne '') {
- $form{'courseid'} = $courseid;
- $firsturl = '/adm/selfenroll?courseid='.$courseid;
- }
- }
- if ($r->dir_config('lonBalancer') eq 'yes') {
- &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
- $lonhost,'noredirect',undef,\%form);
- if ($token ne '') {
- my $delete = &Apache::lonnet::tmpdel($token);
- }
- $r->internal_redirect('/adm/switchserver');
+ my ($r,$username,$domain,$uhome,$courseid,$token) = @_;
+ my ($is_balancer) = &Apache::lonnet::check_loadbalancing($username,$domain);
+ if ($is_balancer) {
+ Apache::lonauth::success($r, $username, $domain, $uhome,
+ 'noredirect', undef, {});
+
+ Apache::lonnet::tmpdel($token) if $token;
+
+ return 'redirect';
} else {
- &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
- $lonhost,$firsturl,undef,\%form);
+ $courseid = Apache::lonnet::is_course($courseid);
+
+ Apache::lonauth::success($r, $username, $domain, $uhome,
+ ($courseid ? "/adm/selfenroll?courseid=$courseid" : '/adm/roles'),
+ undef, {});
}
- return %form;
+ return;
}
-
+#
+# The screen that the user gets to create his or her account
+# Desired username, desired password, etc
+# Stores token to store DES-key and stage during creation session
+#
sub print_dataentry_form {
- my ($r,$domain,$lonhost,$include,$mailtoken,$now,$username,$start_page) = @_;
+ my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha,
+ $usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
my ($error,$output);
- &print_header($r,$start_page);
- if (open(my $jsh,"<$include/londes.js")) {
+ if (open(my $jsh,"<","$include/londes.js")) {
while(my $line = <$jsh>) {
$r->print($line);
}
close($jsh);
- $output .= &javascript_setforms($now)."\n".&javascript_checkpass($now);
- my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+ $output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion,
+ $usernameset,$condition,$excluded).
+ "\n".&javascript_checkpass($now,'email',$domain);
+ my ($lkey,$ukey) = &Apache::loncommon::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
- my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+ my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
$lonhost);
- my $formtag = '