'.$end_page);
return OK;
}
@@ -100,6 +102,10 @@ sub handler {
my ($js,$courseid,$title);
if (defined($env{'form.courseid'})) {
$courseid = &validate_course($env{'form.courseid'});
+ if (($courseid eq 'relate_3H121116c19344ff3relatel1') ||
+ ($courseid eq 'relate_3e100973b27484f2drelatel1')) {
+ $courseid = 'relate_2764113e81b9e4f0crelatel1';
+ }
}
if ($courseid ne '') {
$js = &catreturn_js();
@@ -112,10 +118,16 @@ 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);
+ $lonhost,$statustocreate);
if ($result eq 'existingaccount') {
$r->print($output);
&print_footer($r);
@@ -133,24 +145,14 @@ sub handler {
$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'});
- }
- }
- }
-
- if (@cancreate == 0) {
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+ my ($cancreate,$statustocreate) = &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 for [_1].',$domdesc).'
';
$r->print($output);
&print_footer($r);
return OK;
@@ -160,12 +162,13 @@ 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.").' ';
$msg .= &username_check($sso_username,$domain,$domdesc,$courseid,
- $lonhost,$contact_email,$contact_name,$sso_logout);
+ $lonhost,$contact_email,$contact_name,
+ $sso_logout,$statustocreate);
} 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).''.
@@ -215,7 +218,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);
@@ -226,28 +229,37 @@ 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,
+ $contact_name,$contact_email,$cancreate,
$lonhost,$domconfig{'usercreation'},
- $courseid);
+ $courseid,$privkey);
} elsif (!$token) {
&print_header($r,$start_page,$courseid);
my $now=time;
- if (grep(/^login$/,@cancreate)) {
+ if (grep(/^login$/,@{$cancreate})) {
my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);
$r->print(&javascript_setforms($now));
}
- if (grep(/^email$/,@cancreate)) {
+ if (grep(/^email$/,@{$cancreate})) {
$r->print(&javascript_validmail());
}
- $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
- $courseid);
+ $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost,
+ $courseid,$pubkey);
}
$r->print($output);
&print_footer($r);
return OK;
}
+sub get_custom_name {
+ my ($domain) = @_;
+ if ($domain eq 'relate') {
+ return 'Mechanics Online';
+ } else {
+ return lc($domain);
+ }
+}
+
sub print_header {
my ($r,$start_page,$courseid) = @_;
$r->print($start_page);
@@ -280,7 +292,7 @@ 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 +300,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');
}
@@ -376,6 +388,13 @@ function validate_email() {
if (validmail(field) == false) {
alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
return false;
+ } else {
+ var emailaddr = field.value;
+ var lcemail = emailaddr.toLowerCase();
+ if (emailaddr != lcemail) {
+ field.value = lcemail;
+ alert("Mechanics Online usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
+ }
}
return true;
}
@@ -385,36 +404,54 @@ ENDSCRIPT
}
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 ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid,$pubkey) = @_;
+ my %lt = &Apache::lonlocal::texthash (
+ unam => 'username',
+ udom => 'domain',
+ uemail => 'E-mail address in LON-CAPA',
+ proc => 'Proceed',
+ crea => 'Create account with a username provided by this institution',
+ crlc => 'Create LON-CAPA account',
+ type => 'Type in your log-in ID and password to find out.',
+ plse => 'Please enter a valid e-mail address below.',
+ inst => 'Instructions on how to activate your account will be sent to the e-mail address you provide.',
+ aftr => 'After completing the activation process you will be directed to the course.',
+ ther => 'There you will have access to a "self test" that will help you assess your readiness for the course.',
+ ywil => 'You will also have access to introductory material and to the course schedule and policies.',
+ yous => 'Your user id for the course is your email address.',
+ );
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.').'
';
+ $output = '
'.$lt{'crea'}.'
';
+ my $submit_text = $lt{'crlc'};
+ $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.',' ').
+ '
';
+ my $captchaform = &create_recaptcha($pubkey);
if ($captchaform) {
- my $submit_text = &mt('Request LON-CAPA account');
+ my $submit_text = &mt('Sign-up');
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.',' ').'
';
+ $output .= &mt('Provide your e-mail address to sign up for a Mechanics Online account [_1]if you do not have a log-in ID at your institution.',' ').'
';
} else {
$output .= ' ';
}
- $output .= '';
return $output;
}
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
- $server,$settings,$courseid) = @_;
- $useremail = $env{'form.useremail'};
+ $server,$settings,$courseid,$privkey) = @_;
+ $useremail = lc($env{'form.useremail'});
my $output;
if (ref($cancreate) eq 'ARRAY') {
if (!grep(/^email$/,@{$cancreate})) {
@@ -523,33 +552,29 @@ sub process_email_request {
my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
if ($uhome ne 'no_host') {
$output = &invalid_state('existinguser',$domdesc,
- $contact_name,$contact_email);
+ $contact_name,$contact_email,'',$useremail);
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)',
- );
- if ($captcha_chk != 1) {
+ my $captcha = Captcha::reCAPTCHA->new;
+ my $captcha_result =
+ $captcha->check_answer(
+ $privkey,
+ $ENV{'REMOTE_ADDR'},
+ $env{'form.recaptcha_challenge_field'},
+ $env{'form.recaptcha_response_field'},
+ );
+ # PRIVATE key from https://www.google.com/recaptcha
+ if (!$captcha_result->{is_valid}) {
$output = &invalid_state('captcha',$domdesc,$contact_name,
- $contact_email,$captcha_hash{$captcha_chk});
+ $contact_email);
+
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');
+ \%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}) {
@@ -593,7 +618,7 @@ sub call_rulecheck {
sub send_token {
my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
my $msg = '
'.&mt('Account creation status').'
'.
- &mt('Thank you for your request to create a new LON-CAPA account.').
+ &mt('Thank you for your request to create a new Mechanics Online account.').
'
';
my $now = time;
my %info = ('ip' => $ENV{'REMOTE_ADDR'},
@@ -601,17 +626,31 @@ sub send_token {
'domain' => $domain,
'username' => $email,
'courseid' => $courseid);
- my $token = &Apache::lonnet::tmpput(\%info,$server);
+ 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);
+ my $mailsubj = &mt('Your Mechanics Online Course Account');
+ my $msgfrom = &mt('Mechanics Online Course Staff');
+ my $mailmsg = &mt('Greetings.')."\n\n".
+ &mt('Thank you for your interest in our Online Mechanics Course.').
+ ' '.
+ &mt('In order to complete the registration process, please open the following link in your web browser:').
+ "\n\n".
+ &Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token.
+ "\n\n".
+ &mt('This link will take you to a sign-up page where you will be asked to provide some general information and finalize the registration process.').
+ ' '.
+ &mt('A self-test (for review) is available within the course, for you to test your level of preparation.').
+ "\n\n".
+ &mt('Best Regards,').
+ "\n\n".
+ &mt('RELATE Group')."\n";
+
+ my $result = &Apache::resetpw::send_mail('MIT',$email,$mailmsg,
+ $msgfrom,$contact_email,
+ $mailsubj);
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.",'','');
+ $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 sign-up 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.').' '.
@@ -647,7 +686,7 @@ sub process_mailtoken {
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 $mailmsg = &mt('A [_1] account 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);
@@ -658,7 +697,7 @@ sub process_mailtoken {
}
my %form = &start_session($r,$data{'username'},$domain,
$lonhost,$data{'courseid'},
- $token);
+ $token,'new');
$nostart = 1;
$noend = 1;
} else {
@@ -685,7 +724,7 @@ sub process_mailtoken {
}
sub start_session {
- my ($r,$username,$domain,$lonhost,$courseid,$token) = @_;
+ my ($r,$username,$domain,$lonhost,$courseid,$token,$usertype) = @_;
my %form = (
uname => $username,
udom => $domain,
@@ -696,6 +735,9 @@ sub start_session {
if ($courseid ne '') {
$form{'courseid'} = $courseid;
$firsturl = '/adm/selfenroll?courseid='.$courseid;
+ if ($usertype) {
+ $firsturl .= '&usertype='.$usertype;
+ }
}
}
if ($r->dir_config('lonBalancer') eq 'yes') {
@@ -725,7 +767,7 @@ sub print_dataentry_form {
$output .= &javascript_setforms($now)."\n".&javascript_checkpass($now);
my ($lkey,$ukey) = &Apache::lonpreferences::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 = '