--- loncom/interface/createaccount.pm	2008/07/17 20:19:43	1.23
+++ 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.23 2008/07/17 20:19:43 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);
@@ -58,10 +58,21 @@ sub handler {
     my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
     my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
+    &Apache::lonacc::get_posted_cgi($r);
+    &Apache::lonlocal::get_language_handle($r);
+
     if ($sso_username ne '' && $sso_domain ne '') {
-        $domain = $sso_domain; 
-    } else { 
+        $domain = $sso_domain;
+    } else {
         $domain = &Apache::lonnet::default_login_domain();
+        if (defined($env{'form.courseid'})) {
+            if (&validate_course($env{'form.courseid'})) {
+                if ($env{'form.courseid'} =~ /^($match_domain)_($match_courseid)$/) {
+                    $domain = $1; 
+                }
+            }
+        }
     }
     my $domdesc = &Apache::lonnet::domain($domain,'description');
     my $contact_name = &mt('LON-CAPA helpdesk');
@@ -74,12 +85,8 @@ sub handler {
     my $include = $r->dir_config('lonIncludes');
     my $start_page;
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
-    &Apache::lonacc::get_posted_cgi($r);
-    &Apache::lonlocal::get_language_handle($r);
-
     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 =
@@ -143,7 +150,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 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);
         &print_footer($r);
         return OK;
@@ -306,9 +313,10 @@ sub validate_course {
 sub javascript_setforms {
     my ($now) =  @_;
     my $js = <<ENDSCRIPT;
- <script language="JavaScript">
+ <script type="text/javascript" language="JavaScript">
     function send() {
         this.document.server.elements.uname.value = this.document.client.elements.uname.value;
+        this.document.server.elements.udom.value = this.document.client.elements.udom.value;
         uextkey=this.document.client.elements.uextkey.value;
         lextkey=this.document.client.elements.lextkey.value;
         initkeys();
@@ -339,16 +347,16 @@ sub javascript_checkpass {
         var upasscheck = this.document.client.elements.upasscheck$now.value;
         if (upass == '') {
             alert("$nopass");
-            return;
+            return false;
         }
         if (upass == upasscheck) {
             this.document.client.elements.upasscheck$now.value='';
             send();
-            return;
+            return false;
         } else {
             alert("$mismatchpass");
-            return;
-        } 
+            return false;
+        }
     }
 </script>
 ENDSCRIPT
@@ -381,7 +389,7 @@ sub print_username_form {
     my %lt = &Apache::lonlocal::texthash(
                                          unam => 'username',
                                          udom => 'domain',
-                                         uemail => 'Email address in LON-CAPA',
+                                         uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
@@ -397,34 +405,45 @@ 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>';
-            if (grep(/^login$/,@{$cancreate})) {
-                $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','<br />').'<br /><br />';
+            my $captchaform = &create_recaptcha();
+            if ($captchaform) {
+                my $submit_text = &mt('Request LON-CAPA account');
+                my $emailform = '<input type="text" name="useremail" size="25" value="" />';
+                if (grep(/^login$/,@{$cancreate})) {
+                    $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','<br />').'<br /><br />';
+                } else {
+                    $output .= '<br />';
+                }
+                $output .=  '<form name="createaccount" method="post" onSubmit="return validate_email()" action="/adm/createaccount">'.
+                            &Apache::lonhtmlcommon::start_pick_box()."\n".
+                            &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
+                                                             'LC_pick_box_title')."\n".
+                            $emailform."\n".
+                            &Apache::lonhtmlcommon::row_closure(1).
+                            &Apache::lonhtmlcommon::row_title(&mt('Validation'),
+                                                             'LC_pick_box_title')."\n".
+                            $captchaform."\n".'<br /><br />';
+                if ($courseid ne '') {
+                    $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; 
+                }
+                $output .=  &Apache::lonhtmlcommon::row_closure(1).
+                            &Apache::lonhtmlcommon::row_title().'<br />'.
+                            '<input type="submit" name="create_with_email" value="'. 
+                            $submit_text.'" />'.
+                            &Apache::lonhtmlcommon::row_closure(1).
+                            &Apache::lonhtmlcommon::end_pick_box().'<br /><br />';
+                if ($courseid ne '') {
+                    $output .= &Apache::lonhtmlcommon::echo_form_input(['courseid']);
+                }
+                $output .= '</form>';
             } else {
-                $output .= '<br />';
-            }
-            my $emailform = '<input type="text" name="useremail" size="25" value="" />';
-            my $captchaform = &create_captcha();
-            my $submit_text = &mt('Request LON-CAPA account');
-            $output .=  '<form name="createaccount" method="post" onSubmit="return validate_email()" action="/adm/createaccount">'.
-                        &Apache::lonhtmlcommon::start_pick_box()."\n".
-                        &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
-                                                         'LC_pick_box_title')."\n".
-                        $emailform."\n".
-                        &Apache::lonhtmlcommon::row_closure(1).
-                        &Apache::lonhtmlcommon::row_title(&mt('Validation'),
-                                                         'LC_pick_box_title')."\n".
-                        $captchaform."\n".'<br /><br />';
-            if ($courseid ne '') {
-                $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; 
-            }
-            $output .= '<input type="submit" name="create_with_email" value="'. 
-                        $submit_text.'" />'.
-                        &Apache::lonhtmlcommon::row_closure(1).
-                        &Apache::lonhtmlcommon::end_pick_box().'<br /><br />';
-            if ($courseid ne '') {
-                $output .= &Apache::lonhtmlcommon::echo_form_input(['courseid']);
+                my $helpdesk = '/adm/helpdesk?origurl=%2fadm%2fcreateaccount';
+                if ($courseid ne '') {
+                    $helpdesk .= '&courseid='.$courseid;
+                }
+                $output .= '<span class="LC_error">'.&mt('An error occurred generating the validation code[_1] required for an e-mail address to be used as username.','<br />').'</span><br /><br />'.&mt('[_1]Contact the helpdesk[_2] or [_3]reload[_2] the page and try again.','<a href="'.$helpdesk.'">','</a>','<a href="javascript:window.location.reload()">');
             }
-            $output .= '</form></div>';
+            $output .= '</div>';
         }
     }
     if ($output eq '') {
@@ -447,20 +466,11 @@ sub login_box {
     my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
                                        $lonhost);
     $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
-    my $unameform = '<input type="text" name="uname" size="10" value="" />';
-    my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
-    $output .= '<form name="client" method="post" action="/adm/createaccount">'."\n".
-               &Apache::lonhtmlcommon::start_pick_box()."\n";
-    if ($context eq 'selfenroll') {
-        my $udomform =  '<input type="text" name="udom" size="10" value="'.
-                        $domain.'" />';
-        $output .= &Apache::lonhtmlcommon::row_title(&mt('Domain'),
-                                                     'LC_pick_box_title')."\n".
-                   $udomform."\n".
-                   &Apache::lonhtmlcommon::row_closure(1)."\n";
-    }
-
-    $output .= &Apache::lonhtmlcommon::row_title($titles{$context},
+    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".
+               &Apache::lonhtmlcommon::start_pick_box()."\n".
+               &Apache::lonhtmlcommon::row_title($titles{$context},
                                                  'LC_pick_box_title')."\n".
                $unameform."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".
@@ -470,7 +480,9 @@ sub login_box {
                '<input type="button" name="username_validation" value="'.
                $submit_text.'" onclick="javascript:send()" />'."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\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".
                '</form>';
@@ -498,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);
@@ -576,10 +583,10 @@ sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server);
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
-        my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account at the following institution: [_2].',localtime(time),$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 $showtime = localtime(time);
+        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,
                                                  $contact_email);
         if ($result eq 'ok') {
@@ -619,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);
@@ -699,79 +706,65 @@ sub print_dataentry_form {
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
         my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
                                            $lonhost);
-        my @userinfo = ('firstname','middlename','lastname','generation','id',
-                        'permanentemail');
-        my %lt=&Apache::lonlocal::texthash(
-                    'pd'             => "Personal Data",
-                    'firstname'      => "First Name",
-                    'middlename'     => "Middle Name",
-                    'lastname'       => "Last Name",
-                    'generation'     => "Generation",
-                    'permanentemail' => "Permanent e-mail address",
-                    'id'             => "ID/Student Number",
-                    'lg'             => "Login Data"
-        );
-        my %textboxsize = (
-                           firstname      => '15',
-                           middlename     => '15',
-                           lastname       => '15',
-                           generation     => '5',
-                           id             => '15',
-                          );
-        my $genhelp=&Apache::loncommon::help_open_topic('Generation');
-        $output .= '<div class="LC_left_float"><h3>'.$lt{'pd'}.'</h3>'.
-                  '<form name="server" method="post" target="_top" action="/adm/createaccount">'.
-                  &Apache::lonhtmlcommon::start_pick_box();
-        foreach my $item (@userinfo) {
-            my $rowtitle = $lt{$item};
-            if ($item eq 'generation') {
-                $rowtitle = $genhelp.$rowtitle;
-            }
-            $output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
-            if ($item eq 'permanentemail') {
-                $output .= $username;
-            } else {
-                $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-            }
-            $output .= &Apache::lonhtmlcommon::row_closure(1);
+        my $formtag = '<form name="server" method="post" target="_top" action="/adm/createaccount">';
+        my ($datatable,$rowcount,$editable) =
+            &Apache::loncreateuser::personal_data_display($username,$domain,
+                                                          'email','selfcreate');
+        if ($rowcount) {
+            $output .= '<div class="LC_left_float">'.$formtag.$datatable;
+        } else {
+            $output .= $formtag;
         }
-        $output .= &Apache::lonhtmlcommon::end_pick_box();
         $output .= <<"ENDSERVERFORM";
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="token" value="$mailtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass" value="" />
+   <input type="hidden" name="udom" value="" />
    <input type="hidden" name="phase" value="createaccount" />
-  </form></div>
+  </form>
 ENDSERVERFORM
+        if ($rowcount) {
+            $output .= '</div>'.
+                       '<div class="LC_left_float">';
+        }
         my $upassone = '<input type="password" name="upass'.$now.'" size="10" />';
         my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" />';
         my $submit_text = &mt('Create LON-CAPA account');
-        $output .= '<div class="LC_left_float"><h3>'.$lt{'lg'}.'</h3>'."\n".
-                   '<form name="client" method="post" />'."\n".
+        $output .= '<h3>'.&mt('Login Data').'</h3>'."\n".
+                   '<form name="client" method="post" '.
+                   'onsubmit="return checkpass();">'."\n".
                    &Apache::lonhtmlcommon::start_pick_box()."\n".
                    &Apache::lonhtmlcommon::row_title(&mt('Username'),
-                                                    'LC_pick_box_title')."\n".
+                                                     'LC_pick_box_title',
+                                                     'LC_oddrow_value')."\n".
                    $username."\n".
                    &Apache::lonhtmlcommon::row_closure(1)."\n".
                    &Apache::lonhtmlcommon::row_title(&mt('Password'),
-                                                    'LC_pick_box_title')."\n".
+                                                    'LC_pick_box_title',
+                                                    'LC_oddrow_value')."\n".
                    $upassone."\n".
                    &Apache::lonhtmlcommon::row_closure(1)."\n".
                    &Apache::lonhtmlcommon::row_title(&mt('Confirm password'),
-                                                'LC_pick_box_title')."\n".
-                   $upasstwo."\n".
+                                                     'LC_pick_box_title',
+                                                     'LC_oddrow_value')."\n".
+                   $upasstwo.
+                   &Apache::lonhtmlcommon::row_closure(1)."\n".
+                   &Apache::lonhtmlcommon::row_title()."\n".
+                   '<br /><input type="submit" name="createaccount" value="'.
+                   $submit_text.'" />'.
                    &Apache::lonhtmlcommon::row_closure(1)."\n".
                    &Apache::lonhtmlcommon::end_pick_box()."\n".
-                   '<input type="hidden" name="uname" value="'.$username.'">'."\n".
-                   '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
-                   '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
-                   '</form></div>'."\n".
-                   '<div class="LC_clear_float_footer"><br /><br />'."\n".
-                   '<form name="buttonform">'."\n".
-                   '<input type="button" name="createaccount" value="'.
-                   $submit_text.'" onclick="javascript:checkpass();" /></form></div>';
+                   '<input type="hidden" name="uname" value="'.$username.'" />'."\n".
+                   '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
+                   '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
+                   '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
+                   '</form>';
+        if ($rowcount) {
+            $output .= '</div>'."\n".
+                       '<div class="LC_clear_float_footer"></div>'."\n";
+        }
     } else {
         $output = &mt('Could not load javascript file [_1]','<tt>londes.js</tt>');
     }
@@ -831,7 +824,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 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.');
+            $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.');
             return ('existingaccount',$output);
         } else {
             $output = &login_failure_msg($courseid);
@@ -1084,7 +1077,7 @@ sub invalid_state {
     } elsif ($error eq 'existinguser') {
         $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 for this LON-CAPA 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.');
     } elsif ($error eq 'captcha') {
@@ -1112,29 +1105,11 @@ sub linkto_email_help {
     return $msg;
 }
 
-sub create_captcha {
-    my ($output_dir,$db_dir) = @_;
-    my %captcha_params = &captcha_settings();
-    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'});
-    my $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">';
-    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 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 getkeys {
@@ -1164,6 +1139,7 @@ sub serverform {
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass" value="" />
+   <input type="hidden" name="udom" value="" />
    <input type="hidden" name="phase" value="$phase" />
    <input type="hidden" name="courseid" value="$courseid" />
    $catalog_elements