--- loncom/interface/createaccount.pm	2008/07/14 08:26:57	1.20
+++ 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.20 2008/07/14 08:26:57 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);
@@ -52,16 +52,27 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    
+
     my $domain;
 
     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 =
@@ -90,35 +97,41 @@ sub handler {
         return OK;
     }
 
-    my $courseid;
+    my ($js,$courseid,$title);
     if (defined($env{'form.courseid'})) {
         $courseid = &validate_course($env{'form.courseid'});
     }
+    if ($courseid ne '') {
+        $js = &catreturn_js();
+        $title = 'Self-enroll in a LON-CAPA course';
+    } else {
+        $title = 'Create a user account in LON-CAPA';
+    }
     if ($env{'form.phase'} eq 'selfenroll_login') {
+        $title = 'Self-enroll in a LON-CAPA course';
         if ($env{'form.udom'} ne '') {
             $domain = $env{'form.udom'};
         }
         my ($result,$output) =
             &username_validation($r,$env{'form.uname'},$domain,$domdesc,
- 
                                  $contact_name,$contact_email,$courseid,
                                  $lonhost);
         if ($result eq 'existingaccount') {
             $r->print($output);
-            $r->print(&Apache::loncommon::end_page());
+            &print_footer($r);
             return OK;
         } else {
             $start_page = 
-                &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course','',
+                &Apache::loncommon::start_page($title,$js,
                                                {'no_inline_link'   => 1,});
-            &print_header($r,$start_page);
-            $r->print($output.&Apache::loncommon::end_page());    
+            &print_header($r,$start_page,$courseid);
+            $r->print($output);
+            &print_footer($r);    
             return OK;
         }
     }
-
     $start_page =
-        &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+        &Apache::loncommon::start_page($title,$js,
                                        {'no_inline_link'   => 1,});
     my @cancreate;
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
@@ -134,17 +147,17 @@ sub handler {
     }
 
     if (@cancreate == 0) {
-        &print_header($r,$start_page);
+        &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);
-        $r->print(&Apache::loncommon::end_page());
+        &print_footer($r);
         return OK;
     }
 
     if ($sso_username ne '') {
-        &print_header($r,$start_page);
+        &print_header($r,$start_page,$courseid);
         my ($msg,$sso_logout);
         $sso_logout = &sso_logout_frag($r,$domain);
         if (grep(/^sso$/,@cancreate)) {
@@ -159,7 +172,7 @@ sub handler {
                    $sso_logout;
         }
         $r->print($msg);
-        $r->print(&Apache::loncommon::end_page());
+        &print_footer($r);
         return OK;
     }
 
@@ -174,13 +187,13 @@ sub handler {
                 return OK;
             } else {
                 $r->print($output);
-                $r->print(&Apache::loncommon::end_page());
+                &print_footer($r);
                 return OK;
             }
         } else {
-            &print_header($r,$start_page);
+            &print_header($r,$start_page,$courseid);
             $r->print($output);
-            $r->print(&Apache::loncommon::end_page());
+            &print_footer($r);
             return OK;
         }
     }
@@ -194,9 +207,9 @@ sub handler {
                 return OK;
             }
         }
-        &print_header($r,$start_page);
+        &print_header($r,$start_page,$courseid);
         $r->print($output);
-        $r->print(&Apache::loncommon::end_page());
+        &print_footer($r);
         return OK;
     } elsif ($env{'form.phase'} eq 'username_validation') { 
         (my $result,$output) = 
@@ -205,19 +218,19 @@ sub handler {
                                  $lonhost);
         if ($result eq 'existingaccount') {
             $r->print($output);
-            $r->print(&Apache::loncommon::end_page());
+            &print_footer($r);
             return OK;
         } else {
-            &print_header($r,$start_page);
+            &print_header($r,$start_page,$courseid);
         }
     } elsif ($env{'form.create_with_email'}) {
-        &print_header($r,$start_page);
+        &print_header($r,$start_page,$courseid);
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
                                          $contact_name,$contact_email,\@cancreate,
                                          $lonhost,$domconfig{'usercreation'},
                                          $courseid);
     } elsif (!$token) {
-        &print_header($r,$start_page);
+        &print_header($r,$start_page,$courseid);
         my $now=time;
         if (grep(/^login$/,@cancreate)) {
             my $jsh=Apache::File->new($include."/londes.js");
@@ -228,17 +241,21 @@ sub handler {
             $r->print(&javascript_validmail());
         }
         $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
-                                       $courseid); 
+                                       $courseid);
     }
     $r->print($output);
-    $r->print(&Apache::loncommon::end_page());
+    &print_footer($r);
     return OK;
 }
 
 sub print_header {
-    my ($r,$start_page) = @_;
+    my ($r,$start_page,$courseid) = @_;
     $r->print($start_page);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($courseid ne '') {
+        my %coursehash = &Apache::lonnet::coursedescription($courseid);
+        &selfenroll_crumbs($r,$courseid,$coursehash{'description'});
+    }
     &Apache::lonhtmlcommon::add_breadcrumb
     ({href=>"/adm/createuser",
       text=>"New username"});
@@ -246,6 +263,42 @@ sub print_header {
     return;
 }
 
+sub print_footer {
+    my ($r) = @_;
+    if ($env{'form.courseid'} ne '') {
+        $r->print('<form name="backupcrumbs" method="post" action="">'.
+                  &Apache::lonhtmlcommon::echo_form_input(['backto','logtoken',
+                      'token','serverid','uname','upass','phase','create_with_email',
+                      'code','useremail','crypt','cfirstname','clastname',
+                      'cmiddlename','cgeneration','cpermanentemail','cid']).
+                  '</form>');
+    }
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub selfenroll_crumbs {
+    my ($r,$courseid,$desc) = @_;
+    &Apache::lonhtmlcommon::add_breadcrumb
+         ({href=>"javascript:ToCatalog('backupcrumbs','')",
+           text=>"Course Catalog"});
+    if ($env{'form.coursenum'} ne '') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"javascript:ToCatalog('backupcrumbs','details')",
+            text=>"Course details"});
+    }
+    my $last_crumb;
+    if ($desc ne '') {
+        $last_crumb = &mt('Self-enroll in [_1]','<span class="LC_cusr_emph">'.$desc.'</span>');
+    } else {
+        $last_crumb = &mt('Self-enroll');
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+                   ({href=>"javascript:ToSelfenroll('backupcrumbs')",
+                     text=>$last_crumb,
+                     no_mt=>"1"});
+    return;
+}
+
 sub validate_course {
     my ($courseid) = @_;
     my ($cdom,$cnum) = ($courseid =~ /^($match_domain)_($match_courseid)$/);
@@ -260,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();
@@ -293,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
@@ -335,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') {
@@ -346,36 +400,50 @@ sub print_username_form {
                 my $submit_text = &mt('Create LON-CAPA account');
                 $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
                 $output .= &login_box($now,$lonhost,$courseid,$submit_text,
-                                      $domain,'createaccount');
+                                      $domain,'createaccount').'</div>';
             }
         }
         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"; 
+                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 .= '<input type="submit" name="create_with_email" value="'. 
-                        $submit_text.'" />'.
-                        &Apache::lonhtmlcommon::row_closure(1).
-                        &Apache::lonhtmlcommon::end_pick_box().'<br /><br /></form>'.
-                        '</div>';
+            $output .= '</div>';
         }
     }
     if ($output eq '') {
@@ -398,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".
@@ -421,17 +480,19 @@ 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></div>';
+               '</form>';
     return $output;
 }
 
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
         $server,$settings,$courseid) = @_;
-    my $useremail = $env{'form.useremail'};
+    $useremail = $env{'form.useremail'};
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
@@ -449,36 +510,27 @@ 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 (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
                 my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
                 if ($uhome eq 'no_host') {
-                    my $checkhash;
-                    my $checks = { 'username' => 1 };
-                    $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
-                    &Apache::loncommon::user_rule_check($checkhash,$checks,
-                          \%alerts,\%rulematch,\%inst_results,\%curr_rules,
-                          \%got_rules);
-                    if (ref($alerts{'useremail'}) eq 'HASH') {
-                        if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
+                    my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+                    &call_rulecheck($useremail,$domain,\%alerts,\%rulematch,
+                                    \%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}) {
                                 $output = &invalid_state('userrules',$domdesc,
                                                          $contact_name,$contact_email);
@@ -503,6 +555,20 @@ sub process_email_request {
     return $output;
 }
 
+sub call_rulecheck {
+    my ($uname,$udom,$alerts,$rulematch,$inst_results,$curr_rules,
+        $got_rules,$tocheck) = @_;
+    my ($checkhash,$checks);
+    $checkhash->{$uname.':'.$udom} = { 'newuser' => 1, };
+    if ($tocheck eq 'username') {
+        $checks = { 'username' => 1 };
+    }
+    &Apache::loncommon::user_rule_check($checkhash,$checks,
+           $alerts,$rulematch,$inst_results,$curr_rules,
+           $got_rules);
+    return;
+}
+
 sub send_token {
     my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
     my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
@@ -517,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') {
@@ -560,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);
@@ -608,7 +674,7 @@ sub start_session {
         $courseid = &validate_course($courseid);
         if ($courseid ne '') {
             $form{'courseid'} = $courseid;
-            $firsturl = '/adm/selfenroll?cid='.$courseid;
+            $firsturl = '/adm/selfenroll?courseid='.$courseid;
         }
     }
     if ($r->dir_config('lonBalancer') eq 'yes') {
@@ -640,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>');
     }
@@ -730,7 +782,7 @@ sub create_account {
                     &mt('Return to previous page').'</a>'.
                     &Apache::loncommon::end_page();
     if ($retrieved eq 'ok') {
-        if ($env{'form.cid'} ne '') {
+        if ($env{'form.courseid'} ne '') {
             my ($result,$userchkmsg) = &check_id($username,$domain,$domdesc);
             if ($result eq 'fail') {
                 $output = $error.&mt('Invalid ID format').$end.
@@ -772,13 +824,10 @@ 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 = '<div class="LC_warning">'.
-                      &mt('Username and/or password could not be authenticated.').
-                      '</div>'.
-                      &mt('Please check the username and password.');
+            $output = &login_failure_msg($courseid);
         }
     } else {
         my $primlibserv = &Apache::lonnet::domain($domain,'primary');
@@ -795,26 +844,35 @@ sub username_validation {
             $output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
                                       $contact_email,$contact_name);
         } else {
-            $output = '<div class="LC_warning">'.
-                      &mt('Username and/or password could not be authenticated.').
-                      '</div>'.
-                      &mt('Please check the username and password.'); 
+            $output = &login_failure_msg($courseid);
         }
     }
     return ('ok',$output);
 }
 
+sub login_failure_msg {
+    my ($courseid) = @_;
+    my $url;
+    if ($courseid ne '') {
+        $url = "/adm/selfenroll?courseid=".$courseid;
+    } else {
+        $url = "/adm/createaccount";
+    }
+    my $output = '<h4>'.&mt('Authentication failed').'</h4><div class="LC_warning">'.
+                 &mt('Username and/or password could not be authenticated.').
+                 '</div>'.
+                 &mt('Please check the username and password.').'<br /><br />';
+                 '<a href="'.$url.'">'.&mt('Try again').'</a>';
+    return $output;
+}
+
 sub username_check {
     my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
         $sso_logout) = @_;
-    my (%rulematch,%inst_results,$newuser,$checkfail,$rowcount,$editable,$output,$msg,
+    my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg,
         %alerts,%curr_rules,%got_rules);
-    $newuser = 1;
-    my $checkhash;
-    my $checks = { 'username' => 1 };
-    $checkhash->{$username.':'.$domain} = { 'newuser' => $newuser };
-    &Apache::loncommon::user_rule_check($checkhash,$checks,\%alerts,\%rulematch,
-                                        \%inst_results,\%curr_rules,\%got_rules);
+    &call_rulecheck($username,$domain,\%alerts,\%rulematch,
+                    \%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}) {
@@ -877,12 +935,21 @@ sub username_check {
                    &mt('Create LON-CAPA account').'" /></form>';
         if ($rowcount) {
             if ($editable) {
-                $msg = &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
+                if ($courseid ne '') { 
+                    $msg = '<h4>'.&mt('User information').'</h4>';
+                }
+                $msg .= &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
             } else {
-                 $msg = &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
+                 if ($courseid ne '') {
+                     $msg = '<h4>'.&mt('Review user information').'</h4>';
+                 }
+                 $msg .= &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
             }
         } else {
-            $msg = '<br />'.&mt('Confirm that you wish to create an account.');
+            if ($courseid ne '') {
+                $msg = '<h4>'.&mt('Confirmation').'</h4>';
+            }
+            $msg .= &mt('Confirm that you wish to create an account.');
         }
         $msg .= $output;
     }
@@ -922,7 +989,7 @@ sub username_activation {
     if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) && 
          ($domdefaults{'auth_arg_def'} ne '')) || 
         ($domdefaults{'auth_def'} eq 'localauth')) {
-        if ($env{'form.cid'} ne '') {
+        if ($env{'form.courseid'} ne '') {
             my ($result,$userchkmsg) = &check_id($username,$domain,$domdesc);
             if ($result eq 'fail') {
                 $output = $error.&mt('Invalid ID format').$end.
@@ -931,13 +998,32 @@ 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);
+        my @userinfo = ('firstname','middlename','lastname','generation',
+                        'permanentemail','id');
+        my %canmodify = 
+            &Apache::loncreateuser::selfcreate_canmodify('selfcreate',$domain,
+                                                         \@userinfo,\%inst_results);
+        foreach my $item (@userinfo) {
+            if ($canmodify{$item}) {
+                $info{$item} = $env{'form.c'.$item};
+            } else {
+                $info{$item} = $inst_results{$username.':'.$domain}{$item}; 
+            }
+        }
+        if (ref($inst_results{$username.':'.$domain}{'inststatus'}) eq 'ARRAY') {
+            my @inststatuses = @{$inst_results{$username.':'.$domain}{'inststatus'}};
+            $info{'inststatus'} = join(':',map { &escape($_); } @inststatuses);
+        }
         my $result =
             &Apache::lonnet::modifyuser($domain,$username,$env{'form.cid'},
                           $domdefaults{'auth_def'},
-                          $domdefaults{'auth_arg_def'},$env{'form.cfirstname'},
-                          $env{'form.cmiddlename'},$env{'form.clastname'},
-                          $env{'form.cgeneration'},undef,undef,
-                          $env{'form.cpermanentemail'});
+                          $domdefaults{'auth_arg_def'},$info{'firstname'},
+                          $info{'middlename'},$info{'lastname'},
+                          $info{'generation'},undef,undef,
+                          $info{'permanentemail'},$info{'inststatus'});
         if ($result eq 'ok') {
             my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'});
             $output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain);
@@ -991,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') {
@@ -1019,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 {
@@ -1056,19 +1124,25 @@ sub getkeys {
 
 sub serverform {
     my ($logtoken,$lonhost,$mailtoken,$courseid,$context) = @_;
-    my $phase = 'username_validation"';
+    my $phase = 'username_validation';
+    my $catalog_elements;
     if ($context eq 'selfenroll') {
         $phase = 'selfenroll_login';
     }
-    my $output .= <<ENDSERVERFORM;
+    if ($courseid ne '') {
+        $catalog_elements = &Apache::lonhtmlcommon::echo_form_input(['courseid','phase']);
+    } 
+    my $output = <<ENDSERVERFORM;
   <form name="server" method="post" action="/adm/createaccount">
    <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="$phase" />
    <input type="hidden" name="courseid" value="$courseid" />
+   $catalog_elements
   </form>
 ENDSERVERFORM
     return $output;
@@ -1153,4 +1227,61 @@ sub sso_logout_frag {
     return $endsessionmsg;
 }
 
+sub catreturn_js {
+    return  <<"ENDSCRIPT";
+<script type="text/javascript">
+
+function ToSelfenroll(formname) {
+    var formidx = getFormByName(formname);
+    if (formidx > -1) {
+        document.forms[formidx].action = '/adm/selfenroll';
+        numidx = getIndexByName(formidx,'phase');
+        if (numidx > -1) {
+            document.forms[formidx].elements[numidx].value = '';   
+        }
+        numidx = getIndexByName(formidx,'context');
+        if (numidx > -1) {
+            document.forms[formidx].elements[numidx].value = '';
+        }
+    }
+    document.forms[formidx].submit();
+}
+
+function ToCatalog(formname,caller) {
+    var formidx = getFormByName(formname);
+    if (formidx > -1) {
+        document.forms[formidx].action = '/adm/coursecatalog';
+        numidx = getIndexByName(formidx,'coursenum');
+        if (numidx > -1) {
+            if (caller != 'details') {
+                document.forms[formidx].elements[numidx].value = '';
+            }
+        }
+    }
+    document.forms[formidx].submit();
+}
+
+function getIndexByName(formidx,item) {
+    for (var i=0;i<document.forms[formidx].elements.length;i++) {
+        if (document.forms[formidx].elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+function getFormByName(item) {
+    for (var i=0; i<document.forms.length; i++) {
+        if (document.forms[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+</script>
+ENDSCRIPT
+
+}
+
 1;