--- loncom/interface/createaccount.pm	2010/12/06 02:39:59	1.37.2.7
+++ loncom/interface/createaccount.pm	2010/02/19 15:41:39	1.38
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.37.2.7 2010/12/06 02:39:59 raeburn Exp $
+# $Id: createaccount.pm,v 1.38 2010/02/19 15:41:39 bisitz 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);
@@ -140,7 +140,6 @@ sub handler {
         &Apache::loncommon::start_page($title,$js,
                                        {'no_inline_link'   => 1,});
 
-    my $inventory = uc($domain);
     my %domconfig = 
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
@@ -148,7 +147,7 @@ sub handler {
         &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 [_1] WebCenter.',$inventory).'</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;
@@ -180,7 +179,7 @@ sub handler {
     if ($token) {
         ($output,$nostart,$noend) = 
             &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
-                               $domdesc,$lonhost,$include,$start_page,$inventory);
+                               $domdesc,$lonhost,$include,$start_page);
         if ($nostart) {
             if ($noend) {
                 return OK;
@@ -227,7 +226,7 @@ sub handler {
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
                                          $contact_name,$contact_email,$cancreate,
                                          $lonhost,$domconfig{'usercreation'},
-                                         $courseid,$inventory);
+                                         $courseid);
     } elsif (!$token) {
         &print_header($r,$start_page,$courseid);
         my $now=time;
@@ -375,13 +374,6 @@ function validate_email() {
     if (validmail(field) == false) {
         alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
         return false;
-    } else {
-       var emailaddr = field.value;
-       var lcemail = emailaddr.toLowerCase();
-       if (emailaddr != lcemail) {
-           field.value = lcemail;
-           alert("WebCenter usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
-       }
     }
     return true;
 }
@@ -411,7 +403,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="" />';
@@ -428,8 +420,7 @@ sub print_username_form {
                             &Apache::lonhtmlcommon::row_closure(1).
                             &Apache::lonhtmlcommon::row_title(&mt('Validation'),
                                                              'LC_pick_box_title')."\n".
-                            $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 />';
+                            $captchaform."\n".'<br /><br />';
                 if ($courseid ne '') {
                     $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; 
                 }
@@ -476,7 +467,6 @@ sub login_box {
     my $unameform = '<input type="text" name="uname" size="20" value="" />';
     my $upassform = '<input type="password" name="upass'.$now.'" size="20" />';
     $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::row_title($titles{$context},
                                                  'LC_pick_box_title')."\n".
@@ -485,6 +475,16 @@ sub login_box {
                &Apache::lonhtmlcommon::row_title(&mt('Password'),
                                                 'LC_pick_box_title')."\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="'.
@@ -505,8 +505,8 @@ sub login_box {
 
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
-        $server,$settings,$courseid,$inventory) = @_;
-    $useremail = lc($env{'form.useremail'});
+        $server,$settings,$courseid) = @_;
+    $useremail = $env{'form.useremail'};
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
@@ -521,21 +521,26 @@ sub process_email_request {
             my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
             if ($uhome ne 'no_host') {
                 $output = &invalid_state('existinguser',$domdesc,
-                                         $contact_name,$contact_email,'',$useremail);
+                                         $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'},
-                                           );
-                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);
@@ -564,7 +569,7 @@ sub process_email_request {
             }
         }
         $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
-                          $contact_email,$courseid,$inventory);
+                          $contact_email,$courseid);
     }
     return $output;
 }
@@ -584,8 +589,7 @@ sub call_rulecheck {
 }
 
 sub send_token {
-    my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid,
-        $inventory) = @_;
+    my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
     my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
               &mt('Thank you for your request to create a new LON-CAPA account.').
               '<br /><br />';
@@ -599,9 +603,9 @@ 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 [_2] WebCenter account.',$showtime,$inventory)." \n".
+        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]',
-                 "\n\n".&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,
                                                  $contact_email);
         if ($result eq 'ok') {
@@ -621,7 +625,7 @@ sub send_token {
 
 sub process_mailtoken {
     my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
-        $include,$start_page,$inventory) = @_;
+        $include,$start_page) = @_;
     my ($msg,$nostart,$noend);
     my %data = &Apache::lonnet::tmpget($token);
     my $now = time;
@@ -641,7 +645,7 @@ sub process_mailtoken {
                 if ($result eq 'ok') {
                     $msg = $output; 
                     my $shownow = &Apache::lonlocal::locallocaltime($now);
-                    my $mailmsg = &mt('A [_1] WebCenter account has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$inventory,$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);
@@ -1131,55 +1135,72 @@ sub check_id {
 }
 
 sub invalid_state {
-    my ($error,$domdesc,$contact_name,$contact_email,$msgtext,$useremail) = @_;
+    my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
     my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">';
     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') {
-        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>';
+        $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
     } 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') {
-        $msg .= &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
+        $msg = &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
     } elsif ($error eq 'captcha') {
-        $msg .= &mt('Validation of the code you entered failed.');
+        $msg = &mt('Validation of the code your entered failed.');
     } elsif ($error eq 'noemails') {
-        $msg .= &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
+        $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
     }
     $msg .= '</span>';
     if ($msgtext) {
         $msg .= '<br />'.$msgtext;
     }
-    $msg .= &linkto_email_help($contact_email,$domdesc,$error);
+    $msg .= &linkto_email_help($contact_email,$domdesc);
     return $msg;
 }
 
 sub linkto_email_help {
-    my ($contact_email,$domdesc,$error) = @_;
+    my ($contact_email,$domdesc) = @_;
     my $msg;
     if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
-        my $href = '/adm/helpdesk?origurl='.$escuri;
-        if ($error eq 'existinguser') {
-            my $escemail = &HTML::Entities::encode($env{'form.useremail'});
-            $href .= '&useremail='.$escemail.'&useraccount='.$escemail;
-        }
-        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="'.$href.'">','</a>',$domdesc).'<br />';
+        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
     } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }
     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 {