version 1.36, 2009/05/04 16:45:57
|
version 1.37.2.1, 2009/12/06 23:48:34
|
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 147 sub handler {
|
Line 147 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 the GCI WebCenter.').'</span><br /><br />'; |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
return OK; |
return OK; |
Line 278 sub selfenroll_crumbs {
|
Line 278 sub selfenroll_crumbs {
|
my ($r,$courseid,$desc) = @_; |
my ($r,$courseid,$desc) = @_; |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>"javascript:ToCatalog('backupcrumbs','')", |
({href=>"javascript:ToCatalog('backupcrumbs','')", |
text=>"Course Catalog"}); |
text=>"Course/Community Catalog"}); |
if ($env{'form.coursenum'} ne '') { |
if ($env{'form.coursenum'} ne '') { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>"javascript:ToCatalog('backupcrumbs','details')", |
({href=>"javascript:ToCatalog('backupcrumbs','details')", |
Line 403 sub print_username_form {
|
Line 403 sub print_username_form {
|
} |
} |
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(); |
my $captchaform = &create_recaptcha(); |
if ($captchaform) { |
if ($captchaform) { |
my $submit_text = &mt('Request LON-CAPA account'); |
my $submit_text = &mt('Request LON-CAPA account'); |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
Line 467 sub login_box {
|
Line 467 sub login_box {
|
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" 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 475 sub login_box {
|
Line 476 sub login_box {
|
&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') { |
|
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). |
$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="'. |
Line 524 sub process_email_request {
|
Line 515 sub process_email_request {
|
$contact_name,$contact_email); |
$contact_name,$contact_email); |
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( |
'PRIVATEKEY', |
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 = ( |
if (!$captcha_result->{is_valid}) { |
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) { |
|
$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 603 sub send_token {
|
Line 589 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 GCI WebCenter account.',$showtime).' '. |
&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); |
&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, |
Line 645 sub process_mailtoken {
|
Line 631 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 GCI WebCenter account has been created [_1] from IP address: [_2]. If you did not perform this action or authorize it, please contact the [_3] ([_4]).',$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 1170 sub linkto_email_help {
|
Line 1156 sub linkto_email_help {
|
return $msg; |
return $msg; |
} |
} |
|
|
sub create_captcha { |
sub create_recaptcha { |
my ($output_dir,$db_dir) = @_; |
my $captcha = Captcha::reCAPTCHA->new; |
my %captcha_params = &captcha_settings(); |
return $captcha->get_options_setter({theme => 'white'})."\n". |
my ($output,$maxtries,$tries) = ('',10,0); |
$captcha->get_html('PUBLICKEY'); # generate public key for IP |
while ($tries < $maxtries) { |
# from http://recaptcha.net/ |
$tries ++; |
|
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 { |