--- loncom/interface/createaccount.pm 2009/01/14 13:13:59 1.27 +++ 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.27 2009/01/14 13:13:59 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'})) { @@ -86,7 +86,7 @@ sub handler { my $start_page; my $handle = &Apache::lonnet::check_for_valid_session($r); - if ($handle ne '') { + if (($handle ne '') && ($handle !~ /^publicuser_\d+$/)) { $start_page = &Apache::loncommon::start_page('Already logged in'); my $end_page = @@ -150,7 +150,7 @@ sub handler { &print_header($r,$start_page,$courseid); my $output = '