--- loncom/interface/createaccount.pm	2009/09/14 15:33:48	1.32.2.1
+++ loncom/interface/createaccount.pm	2010/08/22 20:06:36	1.40.2.2
@@ -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.2.1 2009/09/14 15:33:48 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.2 2010/08/22 20:06:36 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 Captcha::reCAPTCHA;
+use Authen::Captcha;
 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'})) {
@@ -92,7 +92,7 @@ sub handler {
         my $end_page =
             &Apache::loncommon::end_page();
         $r->print($start_page."\n".'<h2>'.&mt('You are already logged in').'</h2>'.
-                  '<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].','<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').
+                  '<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].','<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').
                   '</p><p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'.$end_page);
         return OK;
     }
@@ -112,10 +112,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 +139,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 = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                      '<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 for the GCI WebCenter.').'</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 at this institution ([_1]).',$domdesc).'</span><br /><br />';
         $r->print($output);
         &print_footer($r);
         return OK;
@@ -160,12 +156,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 = '<h3>'.&mt('Account creation').'</h3>'.
                    &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.").'<br />';
 
             $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 = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                    '<span class="LC_warning">'.&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.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
@@ -215,7 +212,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,21 +223,21 @@ 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);
     } 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,
+        $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost,
                                        $courseid);
     }
     $r->print($output);
@@ -280,7 +277,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')",
@@ -405,7 +402,7 @@ sub print_username_form {
         }
         if (grep(/^email$/,@{$cancreate})) {
             $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
-            my $captchaform = &create_recaptcha();
+            my $captchaform = &create_captcha();
             if ($captchaform) {
                 my $submit_text = &mt('Request LON-CAPA account');
                 my $emailform = '<input type="text" name="useremail" size="25" value="" />';
@@ -463,7 +460,7 @@ sub login_box {
                                             );
     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);
     $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
     my $unameform = '<input type="text" name="uname" size="20" value="" />';
@@ -476,15 +473,31 @@ sub login_box {
                &Apache::lonhtmlcommon::row_closure(1)."\n".
                &Apache::lonhtmlcommon::row_title(&mt('Password'),
                                                 'LC_pick_box_title')."\n".
-               $upassform."\n".'<br /><br />'."\n".
-               '<input type="button" name="username_validation" value="'.
-               $submit_text.'" onclick="javascript:send()" />'."\n".
-               &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::end_pick_box()."\n".
-               '<p><a href="/adm/resetpw">'.&mt('Forgot password?').'</a>'.
-               '</p>'."\n".
-               '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
-               '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
+               $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).
+               &Apache::lonhtmlcommon::row_title().
+               '<br /><input type="submit" name="username_validation" value="'.
+               $submit_text.'" />'."\n";
+    if ($context eq 'selfenroll') {
+        $output .= '<br /><br /><table width="100%"><tr><td align="right">'.
+                   '<span class="LC_fontsize_medium">'.
+                   '<a href="/adm/resetpw">'.&mt('Forgot password?').'</a>'.
+                   '</span></td></tr></table>'."\n";
+    }
+    $output .= &Apache::lonhtmlcommon::row_closure(1)."\n".
+               &Apache::lonhtmlcommon::end_pick_box().'<br />'."\n";
+    $output .= '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
+               '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
                '</form>';
     return $output;
 }
@@ -510,25 +523,30 @@ sub process_email_request {
                                          $contact_name,$contact_email);
                 return $output;
             } else {
-                 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}) {
+                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) {
                     $output = &invalid_state('captcha',$domdesc,$contact_name,
-                                             $contact_email);
+                                             $contact_email,$captcha_hash{$captcha_chk});
                     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}) {
@@ -580,11 +598,11 @@ 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 GCI WebCenter account.',$showtime).' '.
+        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,
@@ -626,7 +644,7 @@ sub process_mailtoken {
                 if ($result eq 'ok') {
                     $msg = $output; 
                     my $shownow = &Apache::lonlocal::locallocaltime($now);
-                    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 $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 $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,
                                                                  $contact_email);
@@ -704,10 +722,10 @@ 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 = '<form name="server" method="post" target="_top" action="/adm/createaccount">';
-        my ($datatable,$rowcount,$editable) =
+        my ($datatable,$rowcount) =
             &Apache::loncreateuser::personal_data_display($username,$domain,
                                                           'email','selfcreate');
         if ($rowcount) {
@@ -771,6 +789,32 @@ ENDSERVERFORM
     return $output;
 }
 
+sub get_creation_controls {
+    my ($domain,$usercreation) = @_;
+    my (@cancreate,@statustocreate);
+    if (ref($usercreation) eq 'HASH') {
+        if (ref($usercreation->{'cancreate'}) eq 'HASH') {
+            if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
+                @statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
+            } else {
+                @statustocreate = ('default');
+                my ($othertitle,$usertypes,$types) =
+                    &Apache::loncommon::sorted_inst_types($domain);
+                if (ref($types) eq 'ARRAY') {
+                    push(@statustocreate,@{$types});
+                }
+            }
+            if (ref($usercreation->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+                @cancreate = @{$usercreation->{'cancreate'}{'selfcreate'}};
+            } elsif (($usercreation->{'cancreate'}{'selfcreate'} ne 'none') &&
+                     ($usercreation->{'cancreate'}{'selfcreate'} ne '')) {
+                @cancreate = ($usercreation->{'cancreate'}{'selfcreate'});
+            }
+        }
+    }
+    return (\@cancreate,\@statustocreate);
+}
+
 sub create_account {
     my ($r,$domain,$lonhost,$username,$domdesc) = @_;
     my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
@@ -808,7 +852,7 @@ sub create_account {
 
 sub username_validation {
     my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
-        $lonhost) = @_;
+        $lonhost,$statustocreate) = @_;
     my ($retrieved,$output,$upass);
 
     $username= &LONCAPA::clean_username($username);
@@ -824,7 +868,7 @@ sub username_validation {
         my $result = &Apache::lonnet::authenticate($username,$upass,$domain);
         if ($result ne 'no_host') { 
             my %form = &start_session($r,$username,$domain,$lonhost,$courseid);
-            $output = '<br /><br />'.&mt('A GCI WebCenter account already exists for username [_1].','<tt>'.$username.'</tt>').'<br />'.&mt('The password entered was also correct so you have been logged in.');
+            $output = '<br /><br />'.&mt('A LON-CAPA account already exists for username [_1] at this institution ([_2]).','<tt>'.$username.'</tt>',$domdesc).'<br />'.&mt('The password entered was also correct so you have been logged in.');
             return ('existingaccount',$output);
         } else {
             $output = &login_failure_msg($courseid);
@@ -842,7 +886,8 @@ sub username_validation {
         }
         if ($authok eq 'authorized') {
             $output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
-                                      $contact_email,$contact_name);
+                                      $contact_email,$contact_name,undef,
+                                      $statustocreate);
         } else {
             $output = &login_failure_msg($courseid);
         }
@@ -867,12 +912,12 @@ sub login_failure_msg {
 }
 
 sub username_check {
-    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
-        $sso_logout) = @_;
+    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,
+        $contact_name,$sso_logout,$statustocreate) = @_;
     my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg,
         %alerts,%curr_rules,%got_rules);
     &call_rulecheck($username,$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}{$username}) {
@@ -888,6 +933,21 @@ sub username_check {
         }
     }
     if (!$checkfail) {
+        if (ref($statustocreate) eq 'ARRAY') {
+            $checkfail = 'inststatus';
+            if (ref($inst_results{$username.':'.$domain}{inststatus}) eq 'ARRAY') {
+                foreach my $inststatus (@{$inst_results{$username.':'.$domain}{inststatus}}) {
+                    if (grep(/^\Q$inststatus\E$/,@{$statustocreate})) {
+                        undef($checkfail);
+                        last;
+                    }
+                }
+            } elsif (grep(/^default$/,@{$statustocreate})) {
+                undef($checkfail);
+            }
+        }
+    }
+    if (!$checkfail) {
         $output = '<form method="post" action="/adm/createaccount">';
         (my $datatable,$rowcount,$editable) = 
             &Apache::loncreateuser::personal_data_display($username,$domain,1,'selfcreate',
@@ -903,7 +963,7 @@ sub username_check {
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $username);
-        my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
+        my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost,'createaccount');
         if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
             $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
         } else {
@@ -922,6 +982,10 @@ sub username_check {
         } elsif ($checkfail eq 'authtoken') {
             $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'.
                     '<br />'.$output;
+        } elsif ($checkfail eq 'inststatus') {
+            $msg .= '<span class="LC_warning">'.
+                     &mt('You are not permitted to create a LON-CAPA account.').
+                     '</span><br /><br />'.$output;
         }
         $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',
                 $contact_name,$contact_email).'<br /><hr />'.
@@ -1000,7 +1064,7 @@ sub username_activation {
         # Call modifyuser
         my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info);
         &call_rulecheck($username,$domain,\%alerts,\%rulematch,
-                        \%inst_results,\%curr_rules,%got_rules);
+                        \%inst_results,\%curr_rules,\%got_rules);
         my @userinfo = ('firstname','middlename','lastname','generation',
                         'permanentemail','id');
         my %canmodify = 
@@ -1105,11 +1169,37 @@ sub linkto_email_help {
     return $msg;
 }
 
-sub create_recaptcha {
-    my $captcha = Captcha::reCAPTCHA->new;
-    return $captcha->get_options_setter({theme => 'white'})."\n".
-           $captcha->get_html('PUBLICKEY');  # generate public key for IP
-                                             # from http://recaptcha.net/
+sub create_captcha {
+    my ($output_dir,$db_dir) = @_;
+    my %captcha_params = &captcha_settings();
+    my ($output,$maxtries,$tries) = ('',10,0);
+    while ($tries < $maxtries) {
+        $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').'&nbsp;'.
+                     '<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 {