version 1.40.2.4, 2011/09/29 14:12:21
|
version 1.40.2.5.2.8, 2012/02/14 01:06:12
|
Line 39 use Apache::lonhtmlcommon;
|
Line 39 use Apache::lonhtmlcommon;
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonauth; |
use Apache::lonauth; |
use Apache::resetpw; |
use Apache::resetpw; |
use Authen::Captcha; |
use Captcha::reCAPTCHA; |
use DynaLoader; # for Crypt::DES version |
use DynaLoader; # for Crypt::DES version |
use Crypt::DES; |
use Crypt::DES; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
Line 57 sub handler {
|
Line 57 sub handler {
|
|
|
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
|
my $privkey = $r->dir_config('reCAPTCHA_PRIVATE'); |
|
my $pubkey = $r->dir_config('reCAPTCHA_PUBLIC'); |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonacc::get_posted_cgi($r); |
Line 146 sub handler {
|
Line 148 sub handler {
|
&print_header($r,$start_page,$courseid); |
&print_header($r,$start_page,$courseid); |
my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'. |
my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'. |
'<span class="LC_warning">'. |
'<span class="LC_warning">'. |
&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).'</span><br /><br />'; |
&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).'</span><br /><br />'; |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
return OK; |
return OK; |
Line 225 sub handler {
|
Line 227 sub handler {
|
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$contact_name,$contact_email,$cancreate, |
$contact_name,$contact_email,$cancreate, |
$lonhost,$domconfig{'usercreation'}, |
$lonhost,$domconfig{'usercreation'}, |
$courseid); |
$courseid,$privkey); |
} elsif (!$token) { |
} elsif (!$token) { |
&print_header($r,$start_page,$courseid); |
&print_header($r,$start_page,$courseid); |
my $now=time; |
my $now=time; |
Line 238 sub handler {
|
Line 240 sub handler {
|
$r->print(&javascript_validmail()); |
$r->print(&javascript_validmail()); |
} |
} |
$output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost, |
$output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost, |
$courseid); |
$courseid,$pubkey); |
} |
} |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
return OK; |
return OK; |
} |
} |
|
|
|
sub get_custom_name { |
|
my ($domain) = @_; |
|
if ($domain eq 'relate') { |
|
return 'Mechanics Online'; |
|
} else { |
|
return lc($domain); |
|
} |
|
} |
|
|
sub print_header { |
sub print_header { |
my ($r,$start_page,$courseid) = @_; |
my ($r,$start_page,$courseid) = @_; |
$r->print($start_page); |
$r->print($start_page); |
Line 373 function validate_email() {
|
Line 384 function validate_email() {
|
if (validmail(field) == false) { |
if (validmail(field) == false) { |
alert("$lt{'email'}: "+field.value+" $lt{'notv'}."); |
alert("$lt{'email'}: "+field.value+" $lt{'notv'}."); |
return false; |
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; |
return true; |
} |
} |
Line 382 ENDSCRIPT
|
Line 400 ENDSCRIPT
|
} |
} |
|
|
sub print_username_form { |
sub print_username_form { |
my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_; |
my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid,$pubkey) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash ( |
unam => 'username', |
unam => 'username', |
udom => 'domain', |
udom => 'domain', |
uemail => 'E-mail address in LON-CAPA', |
uemail => 'E-mail address in LON-CAPA', |
proc => 'Proceed'); |
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 have access to a "self test" that will help you assess your readiness for the course.', |
|
thes => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012.', |
|
); |
my $output; |
my $output; |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |
if (grep(/^login$/,@{$cancreate})) { |
if (grep(/^login$/,@{$cancreate})) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) { |
if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) { |
$output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by this institution').'</h3>'; |
$output = '<div class="LC_left_float"><h3>'.$lt{'crea'}.'</h3>'; |
my $submit_text = &mt('Create LON-CAPA account'); |
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.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />'; |
$output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />'). |
|
'<br /><br />'.$lt{'type'}.'<br /><br />'; |
$output .= &login_box($now,$lonhost,$courseid,$submit_text, |
$output .= &login_box($now,$lonhost,$courseid,$submit_text, |
$domain,'createaccount').'</div>'; |
$domain,'createaccount').'</div>'; |
} |
} |
} |
} |
if (grep(/^email$/,@{$cancreate})) { |
if (grep(/^email$/,@{$cancreate})) { |
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'; |
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'. |
my $captchaform = &create_captcha(); |
'<p class="LC_info">'. |
|
&mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','<em>','</em>').'<br />'. |
|
$lt{'plse'}.'</p><ul>'. |
|
'<li>'.$lt{'inst'}.'</li>'. |
|
'<li>'.$lt{'aftr'}.'</li>'. |
|
'<li>'.$lt{'thes'}.'</li></ul>'; |
|
my $captchaform = &create_recaptcha($pubkey); |
if ($captchaform) { |
if ($captchaform) { |
my $submit_text = &mt('Request LON-CAPA account'); |
my $submit_text = &mt('Sign-up'); |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
if (grep(/^login$/,@{$cancreate})) { |
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.','<br />').'<br /><br />'; |
$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.','<br />').'<br /><br />'; |
} else { |
} else { |
$output .= '<br />'; |
$output .= '<br />'; |
} |
} |
$output .= '<form name="createaccount" method="post" onSubmit="return validate_email()" action="/adm/createaccount">'. |
$output .= '<form name="createaccount" method="post" onsubmit="return validate_email()" action="/adm/createaccount">'. |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::row_title(&mt('E-mail address'), |
&Apache::lonhtmlcommon::row_title(&mt('E-mail address'), |
'LC_pick_box_title')."\n". |
'LC_pick_box_title')."\n". |
Line 419 sub print_username_form {
|
Line 452 sub print_username_form {
|
&Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::row_title(&mt('Validation'), |
&Apache::lonhtmlcommon::row_title(&mt('Validation'), |
'LC_pick_box_title')."\n". |
'LC_pick_box_title')."\n". |
$captchaform."\n".'<br /><br />'; |
$captchaform."\n". |
|
&mt('If either word is hard to read, [_1] will replace them.','<image src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').'<br /><br />'; |
if ($courseid ne '') { |
if ($courseid ne '') { |
$output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; |
$output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; |
} |
} |
Line 465 sub login_box {
|
Line 499 sub login_box {
|
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context); |
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context); |
my $unameform = '<input type="text" name="uname" size="20" value="" />'; |
my $unameform = '<input type="text" name="uname" size="20" value="" />'; |
my $upassform = '<input type="password" name="upass'.$now.'" size="20" />'; |
my $upassform = '<input type="password" name="upass'.$now.'" size="20" />'; |
$output .= '<form name="client" method="post" onsubmit="return(send());">'."\n". |
$output .= '<form name="client" method="post" action="" onsubmit="return(send());">'."\n". |
|
'<input type="hidden" name="udom" value="'.$domain.'" />'. |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::row_title($titles{$context}, |
&Apache::lonhtmlcommon::row_title($titles{$context}, |
'LC_pick_box_title')."\n". |
'LC_pick_box_title')."\n". |
Line 473 sub login_box {
|
Line 508 sub login_box {
|
&Apache::lonhtmlcommon::row_closure(1)."\n". |
&Apache::lonhtmlcommon::row_closure(1)."\n". |
&Apache::lonhtmlcommon::row_title(&mt('Password'), |
&Apache::lonhtmlcommon::row_title(&mt('Password'), |
'LC_pick_box_title')."\n". |
'LC_pick_box_title')."\n". |
$upassform; |
$upassform. |
if ($context eq 'selfenroll') { |
&Apache::lonhtmlcommon::row_closure(1). |
my $udomform = '<input type="text" name="udom" size="10" value="'. |
|
$domain.'" />'; |
|
$output .= &Apache::lonhtmlcommon::row_closure(1)."\n". |
|
&Apache::lonhtmlcommon::row_title(&mt('Domain'), |
|
'LC_pick_box_title')."\n". |
|
$udomform."\n"; |
|
} else { |
|
$output .= '<input type="hidden" name="udom" value="'.$domain.'" />'; |
|
} |
|
$output .= &Apache::lonhtmlcommon::row_closure(1). |
|
&Apache::lonhtmlcommon::row_title(). |
&Apache::lonhtmlcommon::row_title(). |
'<br /><input type="submit" name="username_validation" value="'. |
'<br /><input type="submit" name="username_validation" value="'. |
$submit_text.'" />'."\n"; |
$submit_text.'" />'."\n"; |
Line 504 sub login_box {
|
Line 529 sub login_box {
|
|
|
sub process_email_request { |
sub process_email_request { |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
$server,$settings,$courseid) = @_; |
$server,$settings,$courseid,$privkey) = @_; |
$useremail = $env{'form.useremail'}; |
$useremail = lc($env{'form.useremail'}); |
my $output; |
my $output; |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |
if (!grep(/^email$/,@{$cancreate})) { |
if (!grep(/^email$/,@{$cancreate})) { |
Line 520 sub process_email_request {
|
Line 545 sub process_email_request {
|
my $uhome = &Apache::lonnet::homeserver($useremail,$domain); |
my $uhome = &Apache::lonnet::homeserver($useremail,$domain); |
if ($uhome ne 'no_host') { |
if ($uhome ne 'no_host') { |
$output = &invalid_state('existinguser',$domdesc, |
$output = &invalid_state('existinguser',$domdesc, |
$contact_name,$contact_email); |
$contact_name,$contact_email,'',$useremail); |
return $output; |
return $output; |
} else { |
} else { |
my $code = $env{'form.code'}; |
my $captcha = Captcha::reCAPTCHA->new; |
my $md5sum = $env{'form.crypt'}; |
my $captcha_result = |
my %captcha_params = &captcha_settings(); |
$captcha->check_answer( |
my $captcha = Authen::Captcha->new( |
$privkey, |
output_folder => $captcha_params{'output_dir'}, |
$ENV{'REMOTE_ADDR'}, |
data_folder => $captcha_params{'db_dir'}, |
$env{'form.recaptcha_challenge_field'}, |
); |
$env{'form.recaptcha_response_field'}, |
my $captcha_chk = $captcha->check_code($code,$md5sum); |
); |
my %captcha_hash = ( |
# PRIVATE key from https://www.google.com/recaptcha |
0 => 'Code not checked (file error)', |
if (!$captcha_result->{is_valid}) { |
-1 => 'Failed: code expired', |
|
-2 => 'Failed: invalid code (not in database)', |
|
-3 => 'Failed: invalid code (code does not match crypt)', |
|
); |
|
if ($captcha_chk != 1) { |
|
$output = &invalid_state('captcha',$domdesc,$contact_name, |
$output = &invalid_state('captcha',$domdesc,$contact_name, |
$contact_email,$captcha_hash{$captcha_chk}); |
$contact_email); |
|
|
return $output; |
return $output; |
} |
} |
my $uhome=&Apache::lonnet::homeserver($useremail,$domain); |
my $uhome=&Apache::lonnet::homeserver($useremail,$domain); |
Line 602 sub send_token {
|
Line 623 sub send_token {
|
if ($token !~ /^error/ && $token ne 'no_such_host') { |
if ($token !~ /^error/ && $token ne 'no_such_host') { |
my $esc_token = &escape($token); |
my $esc_token = &escape($token); |
my $showtime = localtime(time); |
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).' '. |
my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_2] account.',$showtime,$domdesc)."\n". |
&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]', |
&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); |
"\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
$contact_email); |
$contact_email); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>'); |
$msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the sign-up process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>'); |
} else { |
} else { |
$msg .= '<span class="LC_error">'. |
$msg .= '<span class="LC_error">'. |
&mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'. |
&mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'. |
Line 644 sub process_mailtoken {
|
Line 665 sub process_mailtoken {
|
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$msg = $output; |
$msg = $output; |
my $shownow = &Apache::lonlocal::locallocaltime($now); |
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'}, |
my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'}, |
$mailmsg,$contact_name, |
$mailmsg,$contact_name, |
$contact_email); |
$contact_email); |
Line 751 ENDSERVERFORM
|
Line 772 ENDSERVERFORM
|
my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" />'; |
my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" />'; |
my $submit_text = &mt('Create LON-CAPA account'); |
my $submit_text = &mt('Create LON-CAPA account'); |
$output .= '<h3>'.&mt('Login Data').'</h3>'."\n". |
$output .= '<h3>'.&mt('Login Data').'</h3>'."\n". |
'<form name="client" method="post" '. |
'<form name="client" method="post" action="" '. |
'onsubmit="return checkpass();">'."\n". |
'onsubmit="return checkpass();">'."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::row_title(&mt('Username'), |
&Apache::lonhtmlcommon::row_title(&mt('Username'), |
Line 1145 sub check_id {
|
Line 1166 sub check_id {
|
} |
} |
|
|
sub invalid_state { |
sub invalid_state { |
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_; |
my ($error,$domdesc,$contact_name,$contact_email,$msgtext,$useremail) = @_; |
my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">'; |
my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">'; |
if ($error eq 'baduseremail') { |
if ($error eq 'baduseremail') { |
$msg .= &mt('The e-mail address you provided does not appear to be a valid address.'); |
$msg .= &mt('The e-mail address you provided does not appear to be a valid address.'); |
} elsif ($error eq 'existinguser') { |
} elsif ($error eq 'existinguser') { |
$msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.'); |
my $uname = &HTML::Entities::encode($useremail); |
|
$msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'</span><br /><br /><span class="LC_warning">'.&mt('You can either:').'<ul>'. |
|
'<li>'.&mt('Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username='.$uname.'">','</a>').'</li>'. |
|
'<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname='.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>'). |
|
'</li></ul>'; |
} elsif ($error eq 'userrules') { |
} elsif ($error eq 'userrules') { |
$msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.'); |
$msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.'); |
} elsif ($error eq 'userformat') { |
} elsif ($error eq 'userformat') { |
Line 1186 sub linkto_email_help {
|
Line 1211 sub linkto_email_help {
|
return $msg; |
return $msg; |
} |
} |
|
|
sub create_captcha { |
sub create_recaptcha { |
my ($output_dir,$db_dir) = @_; |
my ($pubkey) = @_; |
my %captcha_params = &captcha_settings(); |
my $captcha = Captcha::reCAPTCHA->new; |
my ($output,$maxtries,$tries) = ('',10,0); |
# generate PUBLICKEY from https://www.google.com/recaptcha |
while ($tries < $maxtries) { |
return $captcha->get_options_setter({theme => 'white'})."\n". |
$tries ++; |
$captcha->get_html($pubkey); |
my $captcha = Authen::Captcha->new ( |
|
output_folder => $captcha_params{'output_dir'}, |
|
data_folder => $captcha_params{'db_dir'}, |
|
); |
|
my $md5sum = $captcha->generate_code($captcha_params{'numchars'}); |
|
|
|
if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') { |
|
$output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n". |
|
&mt('Type in the letters/numbers shown below').' '. |
|
'<input type="text" size="5" name="code" value="" /><br />'. |
|
'<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" />'; |
|
last; |
|
} |
|
} |
|
return $output; |
|
} |
|
|
|
sub captcha_settings { |
|
my %captcha_params = ( |
|
output_dir => $Apache::lonnet::perlvar{'lonCaptchaDir'}, |
|
www_output_dir => "/captchaspool", |
|
db_dir => $Apache::lonnet::perlvar{'lonCaptchaDb'}, |
|
numchars => '5', |
|
); |
|
return %captcha_params; |
|
} |
} |
|
|
sub getkeys { |
sub getkeys { |