--- loncom/interface/createaccount.pm	2009/12/06 23:48:34	1.37.2.1
+++ loncom/interface/createaccount.pm	2012/02/13 05:24:22	1.40.2.5.2.5
@@ -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.1 2009/12/06 23:48:34 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.5.2.5 2012/02/13 05:24:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,7 +139,6 @@ sub handler {
     $start_page =
         &Apache::loncommon::start_page($title,$js,
                                        {'no_inline_link'   => 1,});
-
     my %domconfig = 
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
@@ -147,7 +146,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 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 for [_1].',$domdesc).'</span><br /><br />';
         $r->print($output);
         &print_footer($r);
         return OK;
@@ -246,6 +245,15 @@ sub handler {
     return OK;
 }
 
+sub get_custom_name {
+    my ($domain) = @_;
+    if ($domain eq 'relate') {
+        return 'Mechanics Online';
+    } else {
+        return lc($domain);
+    }
+}
+
 sub print_header {
     my ($r,$start_page,$courseid) = @_;
     $r->print($start_page);
@@ -286,7 +294,7 @@ sub selfenroll_crumbs {
     }
     my $last_crumb;
     if ($desc ne '') {
-        $last_crumb = &mt('Self-enroll in [_1]','<span class="LC_cusr_emph">'.$desc.'</span>');
+        $last_crumb = &mt('Self-enroll in [_1]',"<span class='LC_cusr_emph'>$desc</span>");
     } else {
         $last_crumb = &mt('Self-enroll');
     }
@@ -374,6 +382,13 @@ 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("Mechanics Online usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
+       }
     }
     return true;
 }
@@ -384,35 +399,50 @@ ENDSCRIPT
 
 sub print_username_form {
     my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
-    my %lt = &Apache::lonlocal::texthash(
-                                         unam => 'username',
-                                         udom => 'domain',
-                                         uemail => 'E-mail address in LON-CAPA',
-                                         proc => 'Proceed');
+    my %lt = &Apache::lonlocal::texthash (
+        unam   => 'username',
+        udom   => 'domain',
+        uemail => 'E-mail address in LON-CAPA',
+        proc   => 'Proceed',
+        crea   => 'Create account with a username provided by this institution',
+        crlc   => 'Create LON-CAPA account',
+        type   => 'Type in your log-in ID and password to find out.',
+        sign   => 'You are about to sign-up for the Mechanics Online course.',
+        plse   => 'Please enter a valid e-mail address below.',
+        inst   => 'Instructions on how to activate your account will be sent to the e-mail address you provide.',
+        aftr   => 'After completing the activation process you will have access to a "self test" that will help you assess your readiness for the course.',
+        thes   => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012',
+    );
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (grep(/^login$/,@{$cancreate})) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
             if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
-                $output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by this institution').'</h3>';
-                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 = '<div class="LC_left_float"><h3>'.$lt{'crea'}.'</h3>';
+                my $submit_text = $lt{'crlc'};
+                $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 />'.$lt{'type'}.'<br /><br />';
                 $output .= &login_box($now,$lonhost,$courseid,$submit_text,
                                       $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>';
+            $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'.
+                        $lt{'sign'}.'<br />'.
+                        $lt{'plse'}.'<br />'.
+                        $lt{'inst'}.'<br />'.
+                        $lt{'aftr'}.'<br />'.
+                        $lt{'thes'}.'<br />';
             my $captchaform = &create_recaptcha();
             if ($captchaform) {
-                my $submit_text = &mt('Request LON-CAPA account');
+                my $submit_text = &mt('Sign-up');
                 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 />';
+                    $output .= &mt('Provide your e-mail address to sign up for a Mechanics Online 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">'.
+                $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".
@@ -420,7 +450,8 @@ sub print_username_form {
                             &Apache::lonhtmlcommon::row_closure(1).
                             &Apache::lonhtmlcommon::row_title(&mt('Validation'),
                                                              'LC_pick_box_title')."\n".
-                            $captchaform."\n".'<br /><br />';
+                            $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 />';
                 if ($courseid ne '') {
                     $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n"; 
                 }
@@ -461,12 +492,12 @@ 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="" />';
     my $upassform = '<input type="password" name="upass'.$now.'" size="20" />';
-    $output .= '<form name="client" method="post" onsubmit="return(send());">'."\n".
+    $output .= '<form name="client" method="post" action="" onsubmit="return(send());">'."\n".
                '<input type="hidden" name="udom" value="'.$domain.'" />'.
                &Apache::lonhtmlcommon::start_pick_box()."\n".
                &Apache::lonhtmlcommon::row_title($titles{$context},
@@ -475,8 +506,8 @@ sub login_box {
                &Apache::lonhtmlcommon::row_closure(1)."\n".
                &Apache::lonhtmlcommon::row_title(&mt('Password'),
                                                 'LC_pick_box_title')."\n".
-               $upassform;
-    $output .= &Apache::lonhtmlcommon::row_closure(1).
+               $upassform.
+               &Apache::lonhtmlcommon::row_closure(1).
                &Apache::lonhtmlcommon::row_title().
                '<br /><input type="submit" name="username_validation" value="'.
                $submit_text.'" />'."\n";
@@ -497,7 +528,7 @@ sub login_box {
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
         $server,$settings,$courseid) = @_;
-    $useremail = $env{'form.useremail'};
+    $useremail = lc($env{'form.useremail'});
     my $output;
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
@@ -512,7 +543,7 @@ 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);
+                                         $contact_name,$contact_email,'',$useremail);
                 return $output;
             } else {
                  my $captcha = Captcha::reCAPTCHA->new;
@@ -523,6 +554,7 @@ sub process_email_request {
                                             $env{'form.recaptcha_challenge_field'},
                                             $env{'form.recaptcha_response_field'},
                                            );
+                # PRIVATE key from https://www.google.com/recaptcha
                 if (!$captcha_result->{is_valid}) {
                     $output = &invalid_state('captcha',$domdesc,$contact_name,
                                              $contact_email);
@@ -533,7 +565,7 @@ sub process_email_request {
                 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}) {
@@ -585,17 +617,17 @@ 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 [_2] account.',$showtime,$domdesc)."\n".
              &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);
+                 "\n\n".&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') {
-            $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
+            $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the sign-up process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {
             $msg .= '<span class="LC_error">'.
                     &mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'.
@@ -631,7 +663,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 [_1] account 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);
@@ -709,7 +741,7 @@ 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) =
@@ -738,7 +770,7 @@ ENDSERVERFORM
         my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" />';
         my $submit_text = &mt('Create LON-CAPA account');
         $output .= '<h3>'.&mt('Login Data').'</h3>'."\n".
-                   '<form name="client" method="post" '.
+                   '<form name="client" method="post" action="" '.
                    'onsubmit="return checkpass();">'."\n".
                    &Apache::lonhtmlcommon::start_pick_box()."\n".
                    &Apache::lonhtmlcommon::row_title(&mt('Username'),
@@ -783,6 +815,17 @@ sub get_creation_controls {
         if (ref($usercreation->{'cancreate'}) eq 'HASH') {
             if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
                 @statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
+                if (@statustocreate == 0) {
+                    my ($othertitle,$usertypes,$types) =
+                        &Apache::loncommon::sorted_inst_types($domain);
+                    if (ref($types) eq 'ARRAY') {
+                        if (@{$types} == 0) {
+                            @statustocreate = ('default');
+                        }
+                    } else {
+                        @statustocreate = ('default');
+                    }
+                }
             } else {
                 @statustocreate = ('default');
                 my ($othertitle,$usertypes,$types) =
@@ -904,7 +947,7 @@ sub username_check {
     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}) {
@@ -950,7 +993,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 {
@@ -961,7 +1004,7 @@ sub username_check {
         }
     }
     if ($checkfail) { 
-        $msg = '<h4>'.&mt('Account creation unavailable').'</h4>';
+        $msg = '<br /><h4>'.&mt('Account creation unavailable').'</h4>';
         if ($checkfail eq 'username') {
             $msg .= '<span class="LC_warning">'.
                      &mt('A LON-CAPA account may not be created with the username you use.').
@@ -987,7 +1030,7 @@ sub username_check {
         if ($rowcount) {
             if ($editable) {
                 if ($courseid ne '') { 
-                    $msg = '<h4>'.&mt('User information').'</h4>';
+                    $msg = '<br /><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 {
@@ -1051,7 +1094,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 = 
@@ -1121,35 +1164,45 @@ sub check_id {
 }
 
 sub invalid_state {
-    my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
+    my ($error,$domdesc,$contact_name,$contact_email,$msgtext,$useremail) = @_;
     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') {
-        $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
+        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>';
     } 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 your entered failed.');
+        $msg .= &mt('Validation of the code you 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);
+    $msg .= &linkto_email_help($contact_email,$domdesc,$error);
     return $msg;
 }
 
 sub linkto_email_help {
-    my ($contact_email,$domdesc) = @_;
+    my ($contact_email,$domdesc,$error) = @_;
     my $msg;
+    my $href = '/adm/helpdesk';
     if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
-        $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 />';
+        $href .= '?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 />';
     } 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 />';
     }
@@ -1158,9 +1211,9 @@ sub linkto_email_help {
 
 sub create_recaptcha {
     my $captcha = Captcha::reCAPTCHA->new;
+    # generate PUBLICKEY from https://www.google.com/recaptcha
     return $captcha->get_options_setter({theme => 'white'})."\n".
-           $captcha->get_html('PUBLICKEY'); # generate public key for IP
-                                            # from http://recaptcha.net/
+           $captcha->get_html('PUBLICKEY');
 }
 
 sub getkeys {