'.$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).'
';
$r->print($output);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
- my $courseid;
- if (defined($env{'form.courseid'})) {
- $courseid = &validate_course($env{'form.courseid'});
- }
-
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)) {
@@ -141,7 +165,7 @@ sub handler {
$sso_logout;
}
$r->print($msg);
- $r->print(&Apache::loncommon::end_page());
+ &print_footer($r);
return OK;
}
@@ -156,13 +180,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;
}
}
@@ -176,9 +200,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) =
@@ -187,19 +211,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");
@@ -210,17 +234,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"});
@@ -228,6 +256,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)$/);
@@ -325,31 +389,10 @@ sub print_username_form {
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').'
';
- $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.').'
';
- 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);
- my $unameform = '';
- my $upassform = '';
my $submit_text = &mt('Create LON-CAPA account');
- $output .= '
';
+ $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 ($courseid ne '') {
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['courseid']);
+ }
+ $output .= '';
}
}
if ($output eq '') {
@@ -389,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})) {
@@ -569,7 +657,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') {
@@ -691,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.
@@ -736,10 +824,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');
@@ -756,15 +841,28 @@ 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) = @_;
@@ -838,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;
}
@@ -883,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.
@@ -893,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'},
@@ -1016,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;
@@ -1110,4 +1226,61 @@ sub sso_logout_frag {
return $endsessionmsg;
}
+sub catreturn_js {
+ return <<"ENDSCRIPT";
+
+ENDSCRIPT
+
+}
+
1;