--- loncom/interface/createaccount.pm 2009/03/14 02:04:22 1.32
+++ loncom/interface/createaccount.pm 2009/09/14 15:33:48 1.32.2.1
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.32 2009/03/14 02:04:22 raeburn Exp $
+# $Id: createaccount.pm,v 1.32.2.1 2009/09/14 15:33:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,7 +39,7 @@ use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonauth;
use Apache::resetpw;
-use Authen::Captcha;
+use Captcha::reCAPTCHA;
use DynaLoader; # for Crypt::DES version
use Crypt::DES;
use LONCAPA qw(:DEFAULT :match);
@@ -63,7 +63,7 @@ sub handler {
&Apache::lonlocal::get_language_handle($r);
if ($sso_username ne '' && $sso_domain ne '') {
- $domain = $sso_domain;
+ $domain = $sso_domain;
} else {
$domain = &Apache::lonnet::default_login_domain();
if (defined($env{'form.courseid'})) {
@@ -150,7 +150,7 @@ sub handler {
&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 the GCI WebCenter.').'
';
$r->print($output);
&print_footer($r);
return OK;
@@ -405,7 +405,7 @@ sub print_username_form {
}
if (grep(/^email$/,@{$cancreate})) {
$output .= '
'.&mt('Create account with an e-mail address as your username').'
';
- my $captchaform = &create_captcha();
+ my $captchaform = &create_recaptcha();
if ($captchaform) {
my $submit_text = &mt('Request LON-CAPA account');
my $emailform = '';
@@ -476,30 +476,14 @@ sub login_box {
&Apache::lonhtmlcommon::row_closure(1)."\n".
&Apache::lonhtmlcommon::row_title(&mt('Password'),
'LC_pick_box_title')."\n".
- $upassform;
- if ($context eq 'selfenroll') {
- my $udomform = '';
- $output .= &Apache::lonhtmlcommon::row_closure(1)."\n".
- &Apache::lonhtmlcommon::row_title(&mt('Domain'),
- 'LC_pick_box_title')."\n".
- $udomform."\n";
- } else {
- $output .= '';
- }
- $output .= &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title().
- ' '."\n";
- if ($context eq 'selfenroll') {
- $output .= '
'."\n".
+ ''."\n".
''."\n".
'';
return $output;
@@ -526,23 +510,18 @@ sub process_email_request {
$contact_name,$contact_email);
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(
+ 'PRIVATEKEY',
+ $ENV{'REMOTE_ADDR'},
+ $env{'form.recaptcha_challenge_field'},
+ $env{'form.recaptcha_response_field'},
+ ); # generate private key for IP
+ # from http://recaptcha.net/
+ 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);
@@ -605,7 +584,7 @@ sub send_token {
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).' '.
+ 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]',
&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
@@ -647,7 +626,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 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'},
$mailmsg,$contact_name,
$contact_email);
@@ -728,7 +707,7 @@ sub print_dataentry_form {
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
$lonhost);
my $formtag = '