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

Diff for /loncom/auth/lonauth.pm between versions 1.88 and 1.92

version 1.88, 2007/07/25 22:35:47 version 1.92, 2008/05/30 19:09:50
Line 32  use strict; Line 32  use strict;
 use LONCAPA;  use LONCAPA;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use CGI qw(:standard);  use CGI qw(:standard);
 use CGI::Cookie();  
 use DynaLoader; # for Crypt::DES version  use DynaLoader; # for Crypt::DES version
 use Crypt::DES;  use Crypt::DES;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonmenu();  use Apache::lonmenu();
   use Apache::createaccount;
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use Apache::lonlocal;  use Apache::lonlocal;
     
Line 96  sub success { Line 96  sub success {
   
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
        'wel' => 'Welcome',         'wel' => 'Welcome',
        'mes' => 'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up',         'mes' => 'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up.',
        'pro' => 'Problems',         'pro' => 'Login problems?',
        'log' => 'loginproblems.html',         'log' => 'loginproblems.html',
        );         );
     $r->print(<<ENDSUCCESS);      $r->print(<<ENDSUCCESS);
Line 105  $start_page Line 105  $start_page
 $setflags  $setflags
 $windowinfo  $windowinfo
 <h1>$lt{'wel'}</h1>  <h1>$lt{'wel'}</h1>
 $lt{'mes'}.<p>  $lt{'mes'}<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}?</a></p>  <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
 $remoteinfo  $remoteinfo
 $maincall  $maincall
 $continuelink  $continuelink
Line 121  sub failed { Line 121  sub failed {
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,      my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
     {'no_inline_link' => 1,});      {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();      my $end_page   = &Apache::loncommon::end_page();
   
     $message = &mt($message);  
     my %lt=('sorry'  => &mt('Sorry ...'),  
     'please' =>   
     &mt('Please [_1]log in again[_2].',  
  "<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",  
  '</a>'),  
     'problemspage' => &mt('loginproblems.html'),  
     'problems'     => 'Problems',  
     );  
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
       $r->print(
     $r->print(<<ENDFAILED);         $start_page
 $start_page        .'<h1>'.&mt('Sorry ...').'</h1>'
 <h1>$lt{'sorry'}</h1>        .'<p><b>'.&mt($message).'</b></p>'
 <p><b>$message</b></p>        .'<p>'.&mt('Please [_1]log in again[_2].'
 <p>$lt{'please'}</p>                  ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
 <p>        .'</p>'
 <a href="/adm/$lt{'problemspage'}">$lt{'problems'}</a></p>        .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
 $end_page        .$end_page
 ENDFAILED      );
 }   }
   
 # ------------------------------------------------------------------ Rerouting!  # ------------------------------------------------------------------ Rerouting!
   
Line 151  sub reroute { Line 141  sub reroute {
     my ($r) = @_;      my ($r) = @_;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     my $msg='<h1>Sorry ...</h1>      my $msg='<h1>'.&mt('Sorry ...').'</h1>'
              Please <a href="/">log in again</a>.';             .&mt('Please [_1]log in again[_2].');
     &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);      &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);
 }  }
   
Line 170  sub handler { Line 160  sub handler {
     &Apache::lonlocal::get_language_handle($r);      &Apache::lonlocal::get_language_handle($r);
   
 # -------------------------------- Prevent users from attempting to login twice  # -------------------------------- Prevent users from attempting to login twice
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));      my $handle = &Apache::lonnet::check_for_valid_session($r);
     my $lonid=$cookies{'lonID'};      if ($handle ne '') {
     my $cookie;  
     if ($lonid) {  
  my $handle=&LONCAPA::clean_handle($lonid->value);  
         my $lonidsdir=$r->dir_config('lonIDsDir');  
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {  
 # Indeed, a valid token is found  # Indeed, a valid token is found
     &Apache::loncommon::content_type($r,'text/html');   &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;   $r->send_http_header;
     my $start_page =    my $start_page = 
  &Apache::loncommon::start_page('Already logged in');      &Apache::loncommon::start_page('Already logged in');
     my $end_page =    my $end_page = 
  &Apache::loncommon::end_page();      &Apache::loncommon::end_page();
     $r->print(<<ENDFAILED);          $r->print(
 $start_page             $start_page
 <h1>You are already logged in</h1>            .'<h1>'.&mt('You are already logged in!').'</h1>'
 <p>Please either <a href="/adm/roles">continue the current session</a> or            .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].'
 <a href="/adm/logout">logout</a>.</p>                      ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')
 <p>            .'</p>'
 <a href="/adm/loginproblems.html">Problems?</a></p>            .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
 $end_page            .$end_page
 ENDFAILED          );
            return OK;          return OK;
  }  
     }      }
   
 # ---------------------------------------------------- No valid token, continue  # ---------------------------------------------------- No valid token, continue
Line 270  ENDFAILED Line 254  ENDFAILED
     }      }
   
 # ---------------------------------------------------------------- Authenticate  # ---------------------------------------------------------------- Authenticate
     my $authhost=Apache::lonnet::authenticate($form{'uname'},      my @cancreate;
                                               $upass,      my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
                                               $form{'udom'});      if (ref($domconfig{'usercreation'}) eq 'HASH') {
           if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
               if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
                   @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}};
               } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && 
                        ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) {
                   @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'});
               }
           }
       }
       my $defaultauth;
       if (grep(/^login$/,@cancreate)) {
           $defaultauth = 1;
       }
       my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
                                                 $form{'udom'},$defaultauth);
           
 # --------------------------------------------------------------------- Failed?  # --------------------------------------------------------------------- Failed?
   
Line 280  ENDFAILED Line 279  ENDFAILED
  &failed($r,'Username and/or password could not be authenticated.',   &failed($r,'Username and/or password could not be authenticated.',
  \%form);   \%form);
         return OK;          return OK;
       } elsif ($authhost eq 'no_account_on_host') {
           my %domconfig = 
               &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
           if (grep(/^login$/,@cancreate)) {
               my $start_page = 
                   &Apache::loncommon::start_page('Create a user account in LON-CAPA',
                                                  '',{'no_inline_link'   => 1,});
               my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
               my ($output,$checkfail) = &Apache::createaccount::username_check($form{'uname'},
                                                                     $form{'udom'},$domdesc);
               &Apache::loncommon::content_type($r,'text/html');
               $r->send_http_header;
               &Apache::createaccount::print_header($r,$start_page);
               my $msg = '<h4>'.&mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain.').'<br />';
               if ($checkfail) {
                   $msg .= &mt('A LON-CAPA account may not be created with the username you used.');
               } 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('<h4>'.$msg.'</h4>'.$output);
               $r->print(&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);
               return OK;
           }
     }      }
   
     if (($firsturl eq '') ||       if (($firsturl eq '') || 
Removed from v.1.88  
changed lines
  Added in v.1.92

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