--- loncom/auth/lonauth.pm	2008/07/10 00:26:40	1.93
+++ loncom/auth/lonauth.pm	2009/04/01 14:43:19	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.93 2008/07/10 00:26:40 raeburn Exp $
+# $Id: lonauth.pm,v 1.97 2009/04/01 14:43:19 hauer Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,7 +126,7 @@ sub failed {
     $r->print(
        $start_page
       .'<h1>'.&mt('Sorry ...').'</h1>'
-      .'<p><b>'.&mt($message).'</b></p>'
+      .'<p class="LC_warning">'.&mt($message).'</p>'
       .'<p>'.&mt('Please [_1]log in again[_2].'
                 ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
       .'</p>'
@@ -172,7 +172,7 @@ sub handler {
         $r->print(
            $start_page
           .'<h1>'.&mt('You are already logged in!').'</h1>'
-          .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].'
+          .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
                     ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')
           .'</p>'
           .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
@@ -298,32 +298,15 @@ sub handler {
                 &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                         $form{'udom'},$origmail);
             my ($contact_email) = split(',',$contacts); 
-            my ($output,$checkfail) = 
-                &Apache::createaccount::username_check($form{'uname'},$form{'udom'},
-                                                      $domdesc,undef,$lonhost,
-                                                      $contact_email);
+            my $output = &Apache::createaccount::username_check($form{'uname'}, 
+                                                                $form{'udom'},$domdesc,'',
+                                                                $lonhost,$contact_email,$contact_name);
             &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
             &Apache::createaccount::print_header($r,$start_page);
-            my $msg = '<h3>'.&mt('Account creation').'</h3>'.
-                      '<span class="LC_cusr_emph">'.&mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain.').'</span><br />';
-            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>';
-                }
-                &Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $form{'uname'}, in domain $form{'udom'}");
-                $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.');
-            }
-            $r->print($msg.$output);
-            $r->print(&Apache::loncommon::end_page());
+            $r->print('<h3>'.&mt('Account creation').'</h3>'.
+                      &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'<br />'.
+                      $output.&Apache::loncommon::end_page());
             return OK;
         } else {
             &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);