--- loncom/interface/createaccount.pm	2008/07/08 13:57:00	1.11
+++ loncom/interface/createaccount.pm	2008/07/13 00:51:31	1.18
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.11 2008/07/08 13:57:00 raeburn Exp $
+# $Id: createaccount.pm,v 1.18 2008/07/13 00:51:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::Constants qw(:common);
 use Apache::lonacc;
 use Apache::lonnet;
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonauth;
 use Apache::resetpw;
@@ -64,7 +65,11 @@ sub handler {
     }
     my $domdesc = &Apache::lonnet::domain($domain,'description');
     my $contact_name = &mt('LON-CAPA helpdesk');
-    my $contact_email =  $r->dir_config('lonSupportEMail');
+    my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+    my $contacts =
+        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+                                                 $domain,$origmail);
+    my ($contact_email) = split(',',$contacts);
     my $lonhost = $r->dir_config('lonHostID');
     my $include = $r->dir_config('lonIncludes');
     my $start_page;
@@ -107,7 +112,9 @@ sub handler {
 
     if (@cancreate == 0) {
         &print_header($r,$start_page);
-        my $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);
+        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 />';
         $r->print($output);
         $r->print(&Apache::loncommon::end_page());
         return OK;
@@ -120,23 +127,20 @@ sub handler {
 
     if ($sso_username ne '') {
         &print_header($r,$start_page);
-        my ($output,$msg);
+        my ($msg,$sso_logout);
+        $sso_logout = &sso_logout_frag($r,$domain);
         if (grep(/^sso$/,@cancreate)) {
-            $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain.");
-            ($output, my $checkfail) = &username_check($sso_username,$domain,
-                                                       $domdesc,$courseid,
-                                                       $lonhost,$contact_email); 
-            if ($checkfail eq 'username') {
-                $msg .= &mt('A LON-CAPA account may not be created with the username you use.');
-            } elsif ($checkfail eq 'authtoken') {
-                $msg .= &mt('Error creating token.');
-            } else {
-                $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
-            }
+            $msg = '<h3>'.&mt('Account creation').'</h3>'.
+                   &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br />';
+
+            $msg .= &username_check($sso_username,$domain,$domdesc,$courseid, 
+                                    $lonhost,$contact_email,$contact_name,$sso_logout);
         } else {
-            $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.");
+            $msg = '<h3>'.&mt('Account creation unavailable').'</h3>'.
+                   '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
+                   $sso_logout;
         }
-        $r->print('<h4>'.$msg.'</h4>'.$output);
+        $r->print($msg);
         $r->print(&Apache::loncommon::end_page());
         return OK;
     }
@@ -195,6 +199,9 @@ sub handler {
             $r->print(<$jsh>);
             $r->print(&javascript_setforms($now));
         }
+        if (grep(/^email$/,@cancreate)) {
+            $r->print(&javascript_validmail());
+        }
         $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
                                        $courseid); 
     }
@@ -277,6 +284,27 @@ ENDSCRIPT
     return $js;
 }
 
+sub javascript_validmail {
+    my %lt = &Apache::lonlocal::texthash (
+               email => 'The e-mail address you entered',
+               notv  => 'is not a valid e-mail address',
+    );
+    my $output =  "\n".'<script type="text/javascript">'."\n".
+                  &Apache::lonhtmlcommon::javascript_valid_email()."\n";
+    $output .= <<"ENDSCRIPT";
+function validate_email() {
+    field = document.createaccount.useremail;
+    if (validmail(field) == false) {
+        alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
+        return false;
+    }
+    return true;
+}
+ENDSCRIPT
+    $output .= "\n".'</script>'."\n";
+    return $output;
+}
+
 sub print_username_form {
     my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
     my %lt = &Apache::lonlocal::texthash(
@@ -289,8 +317,8 @@ sub print_username_form {
         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 your institution').'</h3>';
-                $output .= &mt('If you already have a log-in ID at your 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>'.&mt('Create account with a username provided by this institution').'</h3>';
+                $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 />';
                 my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
                 my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
                 my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -327,7 +355,7 @@ sub print_username_form {
             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="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".
@@ -347,7 +375,7 @@ sub print_username_form {
         }
     }
     if ($output eq '') {
-        $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
+        $output = &mt('Creation of a new LON-CAPA user account using an e-mail address or an institutional log-in ID as your username is not permitted at [_1].',$domdesc);
     } else {
         $output .= '<div class="LC_clear_float_footer"></div>';
     }
@@ -431,7 +459,9 @@ sub process_email_request {
 
 sub send_token {
     my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
-    my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'<br /><br />';
+    my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
+              &mt('Thank you for your request to create a new LON-CAPA account.').
+              '<br /><br />';
     my $now = time;
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                 'time'       => $now,
@@ -441,7 +471,7 @@ 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 in the [_2] domain.',localtime(time),$domdesc).' '.
+        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);
@@ -450,12 +480,14 @@ sub send_token {
         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>');
         } else {
-            $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')
-                   .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+            $msg .= '<span class="LC_error">'.
+                    &mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'.
+                    ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }
     } else {
-        $msg .= &mt('An error occurred creating a token required for the account creation process.')
-               .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+        $msg .= '<span class="LC_error">'.
+                &mt('An error occurred creating a token required for the account creation process.').'</span><br />'.
+                ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
     }
     return $msg;
 }
@@ -481,8 +513,8 @@ sub process_mailtoken {
                                                        $data{'username'},$domdesc);
                 if ($result eq 'ok') {
                     $msg = $output; 
-                    my $shownow = localtime($now);
-                    my $mailmsg = &mt('A LON-CAPA account in the [_1] domain 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 $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 $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,
                                                                  $contact_email);
@@ -701,8 +733,8 @@ sub username_validation {
             $authok = 'non_authorized';
         }
         if ($authok eq 'authorized') {
-            ($output,undef) = &username_check($username,$domain,$domdesc,
-                                              $courseid,$lonhost,$contact_email); 
+            $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.')
@@ -714,8 +746,10 @@ sub username_validation {
 }
 
 sub username_check {
-    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email) = @_;
-    my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
+    my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
+        $sso_logout) = @_;
+    my (%rulematch,%inst_results,$newuser,$checkfail,$rowcount,$editable,$output,$msg,
+        %alerts,%curr_rules,%got_rules);
     $newuser = 1;
     my $checkhash;
     my $checks = { 'username' => 1 };
@@ -725,47 +759,75 @@ sub username_check {
     if (ref($alerts{'username'}) eq 'HASH') {
         if (ref($alerts{'username'}{$domain}) eq 'HASH') {
             if ($alerts{'username'}{$domain}{$username}) {
-                my ($userchkmsg,$checkfail);
                 if (ref($curr_rules{$domain}) eq 'HASH') {
-                    $userchkmsg =
-                        &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1).
+                    $output =
+                        &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1,
+                                                                  'selfcreate').
                         &Apache::loncommon::user_rule_formats($domain,$domdesc,
                                 $curr_rules{$domain}{'username'},'username');
-                    if ($userchkmsg) {
-                        $checkfail = 'username';
-                    }
                 }
-                return ($userchkmsg,$checkfail);
+                $checkfail = 'username';
             }
         }
     }
-    my $submit_text = &mt('Create LON-CAPA account');
-    my $output = '<form method="post" action="/adm/createaccount">'.
-                 &Apache::loncreateuser::personal_data_display($username,$domain,1,
-                                    undef,$inst_results{$username.':'.$domain}).
-                '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n".
-                '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
-                '<input type="hidden" name="phase" value="username_activation" />';
-    my $now = time;
-    my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
-                'time'       => $now,
-                'domain'     => $domain,
-                'username'   => $username);
-    my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
-    if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
-        $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
-    } else {
-        $output = &mt('An error occurred when storing a token').'<br />'.
-                  &mt('You will not be able to proceed to the next stage of account creation').
-                  &linkto_email_help($contact_email,$domdesc);
-        return($output,'authtoken');
-    }
-    if ($courseid ne '') {
-        $output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-    }
-    $output .= '<input type="submit" name="newaccount" value="'.
-               $submit_text.'" /></form>';
-    return ($output,'');
+    if (!$checkfail) {
+        $output = '<form method="post" action="/adm/createaccount">';
+        (my $datatable,$rowcount,$editable) = 
+            &Apache::loncreateuser::personal_data_display($username,$domain,1,'selfcreate',
+                                                         $inst_results{$username.':'.$domain});
+        if ($rowcount > 0) {
+            $output .= $datatable;
+        }
+        $output .=  '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n".
+                    '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
+                    '<input type="hidden" name="phase" value="username_activation" />';
+        my $now = time;
+        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
+                    'time'       => $now,
+                    'domain'     => $domain,
+                    'username'   => $username);
+        my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
+        if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
+            $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
+        } else {
+            $output = &mt('An error occurred when storing a token').'<br />'.
+                      &mt('You will not be able to proceed to the next stage of account creation').
+                      &linkto_email_help($contact_email,$domdesc);
+            $checkfail = 'authtoken';
+        }
+    }
+    if ($checkfail) { 
+        $msg = '<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.').
+                     '</span><br /><br />'.$output;
+        } elsif ($checkfail eq 'authtoken') {
+            $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'.
+                    '<br />'.$output;
+        }
+        $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',
+                $contact_name,$contact_email).'<br /><hr />'.
+                $sso_logout;
+        &Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $username, in domain $domain");
+    } else {
+        if ($courseid ne '') {
+            $output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />';
+        }
+        $output .= '<input type="submit" name="newaccount" value="'.
+                   &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 />';
+            } 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 />';
+            }
+        } else {
+            $msg = '<br />'.&mt('Confirm that you wish to create an account.');
+        }
+        $msg .= $output;
+    }
+    return $msg;
 }
 
 sub username_activation {
@@ -864,20 +926,21 @@ sub check_id {
 
 sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
-    my $msg;
+    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.');
     } elsif ($error eq 'existinguser') {
-        $msg = &mt('The e-mail address you provided is already in use as a username in this LON-CAPA domain.');
+        $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 domain do not allow the e-mail address you provided to be used as a username.');
+        $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.');
     } elsif ($error eq 'userformat') {
-        $msg = &mt('The e-mail address you provided may not be used as a username in this LON-CAPA domain.');
+        $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.');
     } elsif ($error eq 'noemails') {
-        $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');
+        $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;
     }
@@ -890,9 +953,9 @@ sub linkto_email_help {
     my $msg;
     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 the [_3] domain.','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);
+        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
     } else {
-        $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+        $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }
     return $msg;
 }
@@ -914,9 +977,9 @@ sub create_captcha {
 
 sub captcha_settings {
     my %captcha_params = ( 
-                           output_dir     => $Apache::lonnet::perlvar{'lonDocRoot'}.'/captcha',
-                           www_output_dir => "/captcha",
-                           db_dir         => "/home/www/captchadb",
+                           output_dir     => $Apache::lonnet::perlvar{'lonCaptchaDir'},
+                           www_output_dir => "/captchaspool",
+                           db_dir         => $Apache::lonnet::perlvar{'lonCaptchaDb'},
                            numchars       => '5',
                          );
     return %captcha_params;
@@ -1006,4 +1069,25 @@ sub guest_format_check {
     return $format_msg;
 }
 
+sub sso_logout_frag {
+    my ($r,$domain) = @_;
+    my $endsessionmsg;
+    if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
+        my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
+        if (-e $msgfile) {
+            open(my $fh,"<$msgfile");
+            $endsessionmsg = join('',<$fh>);
+            close($fh);
+        }
+    } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
+        my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
+        if (-e $msgfile) {     
+            open(my $fh,"<$msgfile");
+            $endsessionmsg = join('',<$fh>);
+            close($fh);
+        }
+    }
+    return $endsessionmsg;
+}
+
 1;