'.$end_page);
- return OK;
+ return OK;
}
- $start_page =
- &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
- {'no_inline_link' => 1,});
- if ($env{'form.phase'} eq 'username_activation') {
+
+ 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);
+ &print_footer($r);
+ return OK;
+ } else {
+ $start_page =
+ &Apache::loncommon::start_page($title,$js,
+ {'no_inline_link' => 1,});
+ &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') {
@@ -111,22 +140,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).'
';
+ if ($courseid ne '') {
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['courseid']);
+ }
+ $output .= '';
}
}
if ($output eq '') {
@@ -382,10 +435,52 @@ sub print_username_form {
return $output;
}
+sub login_box {
+ my ($now,$lonhost,$courseid,$submit_text,$domain,$context) = @_;
+ my $output;
+ my %titles = &Apache::lonlocal::texthash(
+ createaccount => 'Log-in ID',
+ selfenroll => 'Username',
+ );
+ my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+ my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
+ my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&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) = @_;
- my $useremail = $env{'form.useremail'};
+ $useremail = $env{'form.useremail'};
my $output;
if (ref($cancreate) eq 'ARRAY') {
if (!grep(/^email$/,@{$cancreate})) {
@@ -562,13 +657,15 @@ 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') {
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
$lonhost,'noredirect',undef,\%form);
- my $delete = &Apache::lonnet::tmpdel($token);
+ if ($token ne '') {
+ my $delete = &Apache::lonnet::tmpdel($token);
+ }
$r->internal_redirect('/adm/switchserver');
} else {
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
@@ -682,7 +779,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.
@@ -707,21 +804,29 @@ sub create_account {
}
sub username_validation {
- my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_;
+ my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
+ $lonhost) = @_;
my ($retrieved,$output,$upass);
$username= &LONCAPA::clean_username($username);
$domain = &LONCAPA::clean_domain($domain);
my $uhome = &Apache::lonnet::homeserver($username,$domain);
- if ($uhome ne 'no_host') {
- $output = &invalid_state('existinguser',$domdesc,
- $contact_name,$contact_email);
- return $output;
- }
($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
$env{'form.serverid'});
- if ($retrieved eq 'ok') {
+ if ($retrieved ne 'ok') {
+ return ('fail',$output);
+ }
+ if ($uhome ne 'no_host') {
+ my $result = &Apache::lonnet::authenticate($username,$upass,$domain);
+ if ($result ne 'no_host') {
+ my %form = &start_session($r,$username,$domain,$lonhost,$courseid);
+ $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 = &login_failure_msg($courseid);
+ }
+ } else {
my $primlibserv = &Apache::lonnet::domain($domain,'primary');
my $authok;
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
@@ -736,12 +841,25 @@ 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;
}
@@ -818,12 +936,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;
}
@@ -863,7 +990,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.
@@ -873,7 +1000,7 @@ sub username_activation {
}
# Call modifyuser
my $result =
- &Apache::lonnet::modifyuser($domain,$username,$env{'form.cid'},
+ &Apache::lonnet::modifyuser($domain,$username,$env{'form.courseid'},
$domdefaults{'auth_def'},
$domdefaults{'auth_arg_def'},$env{'form.cfirstname'},
$env{'form.cmiddlename'},$env{'form.clastname'},
@@ -996,16 +1123,25 @@ sub getkeys {
}
sub serverform {
- my ($logtoken,$lonhost,$mailtoken,$courseid) = @_;
- my $output .= <
+ my ($logtoken,$lonhost,$mailtoken,$courseid,$context) = @_;
+ my $phase = 'username_validation';
+ my $catalog_elements;
+ if ($context eq 'selfenroll') {
+ $phase = 'selfenroll_login';
+ }
+ if ($courseid ne '') {
+ $catalog_elements = &Apache::lonhtmlcommon::echo_form_input(['courseid','phase']);
+ }
+ my $output = <
-
+
+ $catalog_elements
ENDSERVERFORM
return $output;
@@ -1090,4 +1226,61 @@ sub sso_logout_frag {
return $endsessionmsg;
}
+sub catreturn_js {
+ return <<"ENDSCRIPT";
+
+ENDSCRIPT
+
+}
+
1;