--- loncom/interface/createaccount.pm	2008/07/08 03:00:43	1.10
+++ loncom/interface/createaccount.pm	2008/07/10 00:18:05	1.15
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.10 2008/07/08 03:00:43 raeburn Exp $
+# $Id: createaccount.pm,v 1.15 2008/07/10 00:18:05 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 in the domain: [_1] ([_2]).',$domain,$domdesc).'</span><br /><br />';
         $r->print($output);
         $r->print(&Apache::loncommon::end_page());
         return OK;
@@ -122,21 +129,29 @@ sub handler {
         &print_header($r,$start_page);
         my ($output,$msg);
         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.");
+            $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 in this domain.").'<br /><br />';
             ($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.');
+                                                       $lonhost,$contact_email);
+            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>';
+                } elsif ($checkfail eq 'authtoken') {
+                    $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>';
+                }
+                $msg .= '<br /><br />'.
+                        &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
             } 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.');
             }
         } 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 in this domain, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }
-        $r->print('<h4>'.$msg.'</h4>'.$output);
+        $r->print($msg.'<br />'.$output);
         $r->print(&Apache::loncommon::end_page());
         return OK;
     }
@@ -195,6 +210,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 +295,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(
@@ -327,7 +366,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".
@@ -431,7 +470,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,
@@ -450,12 +491,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;
 }
@@ -864,7 +907,7 @@ 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') {
@@ -878,6 +921,7 @@ sub invalid_state {
     } 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 .= '</span>';
     if ($msgtext) {
         $msg .= '<br />'.$msgtext;
     }
@@ -914,9 +958,9 @@ sub create_captcha {
 
 sub captcha_settings {
     my %captcha_params = ( 
-                           output_dir     => "/home/httpd/html/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;