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

Diff for /loncom/auth/migrateuser.pm between versions 1.2 and 1.5

version 1.2, 2005/10/25 19:14:32 version 1.5, 2006/04/05 22:39:55
Line 37  sub goto_login { Line 37  sub goto_login {
     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;
     $r->print(<<TOLOGIN);      $r->print(&Apache::loncommon::start_page('Going to login',undef,
 <html>       {'redirect' =>
   <head>    [0,'/adm/login'],}).
     <meta http-equiv="refresh" content="0;url=/adm/login" />        '<h1>'.&mt('One moment please...').'</h1>'.
     <title>Going to login</title>        '<p>'.&mt('Transferring to login page.').'</p>'.
   </head>        &Apache::loncommon::end_page());
   <body>  
     <h1>One moment please...</h1>  
     <p>  
       Transferring to login page.  
       <a href="/adm/login">Continue</a>  
     </p>  
   </body>  
 </html>  
 TOLOGIN  
     return OK;      return OK;
 }  }
   
Line 60  sub handler { Line 51  sub handler {
     my ($r) = @_;      my ($r) = @_;
           
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
     my %data = &Apache::lonnet::tmpget($env{'form.token'});      my %data =   &Apache::lonnet::tmpget($env{'form.token'});
       my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
   
       if ($delete ne 'ok') {
    return &goto_login($r);
       }
   
     if ($data{'ip'} ne $ENV{'REMOTE_ADDR'} || !defined($data{'username'}) ||      if ($data{'ip'} ne $ENV{'REMOTE_ADDR'} || !defined($data{'username'}) ||
  !defined($data{'domain'}) ) {   !defined($data{'domain'}) ) {
Line 71  sub handler { Line 67  sub handler {
     my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'});      my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'});
     if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); }      if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); }
   
     if (!defined($data{'role'})) {      if (!$data{'role'}) {
  &Apache::lonauth::success($r,$data{'username'},$data{'domain'},   &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
   $home,'/adm/roles');    $home,'/adm/roles');
  return OK;   return OK;
     }      }
       
     my $cookie=&Apache::lonauth::success($r,$data{'username'},$data{'domain'},      my $cookie=&Apache::lonauth::success($r,$data{'username'},$data{'domain'},
  $home,'noredirect');   $home,'noredirect');
     $r->header_out('Set-cookie',"lonID=$cookie; path=/");      $r->header_out('Set-cookie',"lonID=$cookie; path=/");
Removed from v.1.2  
changed lines
  Added in v.1.5

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