'.$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';
@@ -115,38 +124,40 @@ sub handler {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
- my ($cancreate,$statustocreate) =
+ my ($cancreate,$statustocreate,$emailusername) =
&get_creation_controls($domain,$domconfig{'usercreation'});
my ($result,$output) =
&username_validation($r,$env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$courseid,
$lonhost,$statustocreate);
- if ($result eq 'existingaccount') {
+ 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,});
+ $start_page = &Apache::loncommon::start_page($title,$js);
+
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
- my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
+ my ($cancreate,$statustocreate,$emailusername) =
+ &get_creation_controls($domain,$domconfig{'usercreation'});
if (@{$cancreate} == 0) {
&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).'
';
+ &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);
&print_footer($r);
return OK;
@@ -159,10 +170,38 @@ sub handler {
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');
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($domain);
+ $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,$statustocreate);
+ $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).''.
@@ -173,13 +212,18 @@ sub handler {
return OK;
}
- my ($output,$nostart,$noend);
+ my ($output,$nostart,$noend,$redirect);
my $token = $env{'form.token'};
if ($token) {
- ($output,$nostart,$noend) =
+ my $usertype = &get_usertype($domain);
+ ($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'},$usertype);
+ if ($redirect) {
+ $r->internal_redirect('/adm/switchserver');
+ return OK;
+ } elsif ($nostart) {
if ($noend) {
return OK;
} else {
@@ -198,8 +242,11 @@ sub handler {
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;
}
@@ -222,23 +269,29 @@ sub handler {
}
} elsif ($env{'form.create_with_email'}) {
&print_header($r,$start_page,$courseid);
- $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
+ my $usertype = &get_usertype($domain);
+ $output = &process_email_request($env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$cancreate,
$lonhost,$domconfig{'usercreation'},
- $courseid);
+ $emailusername,$courseid,$usertype);
} elsif (!$token) {
&print_header($r,$start_page,$courseid);
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());
}
- $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,$usertype);
}
$r->print($output);
&print_footer($r);
@@ -266,13 +319,29 @@ sub print_footer {
$r->print('');
}
$r->print(&Apache::loncommon::end_page());
}
+sub get_usertype {
+ my ($domain) = @_;
+ my $usertype = 'default';
+ 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
@@ -285,7 +354,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');
}
@@ -296,149 +365,222 @@ 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) = @_;
+ 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";
+ }
}
}
- 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) = @_;
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.');
+ &js_escape(\$nopass);
+ &js_escape(\$mismatchpass);
my $js = <<"ENDSCRIPT";
-
ENDSCRIPT
return $js;
}
sub javascript_validmail {
- my %lt = &Apache::lonlocal::texthash (
+ my %js_lt = &Apache::lonlocal::texthash (
email => 'The e-mail address you entered',
notv => 'is not a valid e-mail address',
);
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(
+ my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername,
+ $usertype) = @_;
+ my %lt = &Apache::lonlocal::texthash (
unam => 'username',
udom => 'domain',
uemail => 'E-mail address in LON-CAPA',
- proc => 'Proceed');
+ proc => 'Proceed',
+ 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).',
+ );
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.',' ').'
';
- } else {
- $output .= ' ';
- }
- $output .= '';
- } else {
+ my ($captchaform,$error,$captcha,$recaptchaversion) =
+ &Apache::loncommon::captcha_display('usercreation',$lonhost);
+ if ($error) {
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.',' ').'