[BACK]Return to lonauth.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.93 and 1.95

version 1.93, 2008/07/10 00:26:40 version 1.95, 2008/10/01 11:11:08
Line 122  sub failed { Line 122  sub failed {
     {'no_inline_link' => 1,});      {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();      my $end_page   = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
       sleep 1; # brute force counteraction: slow down attackers, which try to hack user authentication with automated scripts
     $r->send_http_header;      $r->send_http_header;
     $r->print(      $r->print(
        $start_page         $start_page
       .'<h1>'.&mt('Sorry ...').'</h1>'        .'<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].'        .'<p>'.&mt('Please [_1]log in again[_2].'
                 ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')                  ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
       .'</p>'        .'</p>'
Line 298  sub handler { Line 299  sub handler {
                 &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',                  &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                         $form{'udom'},$origmail);                                                          $form{'udom'},$origmail);
             my ($contact_email) = split(',',$contacts);               my ($contact_email) = split(',',$contacts); 
             my ($output,$checkfail) =               my $output = &Apache::createaccount::username_check($form{'uname'}, 
                 &Apache::createaccount::username_check($form{'uname'},$form{'udom'},                                                                  $form{'udom'},$domdesc,'',
                                                       $domdesc,undef,$lonhost,                                                                  $lonhost,$contact_email,$contact_name);
                                                       $contact_email);  
             &Apache::loncommon::content_type($r,'text/html');              &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;              $r->send_http_header;
             &Apache::createaccount::print_header($r,$start_page);              &Apache::createaccount::print_header($r,$start_page);
             my $msg = '<h3>'.&mt('Account creation').'</h3>'.              $r->print('<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 />';                        &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'<br />'.
             if ($checkfail) {                        $output.&Apache::loncommon::end_page());
                 $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());  
             return OK;              return OK;
         } else {          } 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);              &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);
Removed from v.1.93  
changed lines
  Added in v.1.95

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>