--- loncom/auth/migrateuser.pm 2005/10/24 21:32:42 1.1 +++ loncom/auth/migrateuser.pm 2006/04/05 22:39:55 1.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.1 2005/10/24 21:32:42 albertel Exp $ +# $Id: migrateuser.pm,v 1.5 2006/04/05 22:39:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,7 +26,7 @@ # http://www.lon-capa.org/ # -package Apache::startuser; +package Apache::migrateuser; use strict; use Apache::Constants qw(:common :http :methods); @@ -34,49 +34,52 @@ use Apache::lonauth; use Apache::lonnet; sub goto_login { - my ($r) = @_; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(< - - - Going to login - - -

One moment please...

-

- Transferring to login page. - Continue -

- - -TOLOGIN - return ''; + my ($r) = @_; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page('Going to login',undef, + {'redirect' => + [0,'/adm/login'],}). + '

'.&mt('One moment please...').'

'. + '

'.&mt('Transferring to login page.').'

'. + &Apache::loncommon::end_page()); + return OK; } + sub handler { my ($r) = @_; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); - my $data = &Apache::lonnet::reply('tmpget:'.$env{'form.token'}, - $Apache::lonnet::perlvar{'lonHostID'}); - my ($ip,$udom,$uname,$role) = split('&',$data); - - if ($ip ne $ENV{'REMOTE_ADDR'} && $ip ne '127.0.0.1') { - #error or invalid token - &goto_login($r); - return OK; + my %data = &Apache::lonnet::tmpget($env{'form.token'}); + my $delete = &Apache::lonnet::tmpdel($env{'form.token'}); + + if ($delete ne 'ok') { + return &goto_login($r); } - &Apache::lonnet::logthis("Allowing access for $uname\@$udom to $role"); - my $home=&Apache::lonnet::homeserver($uname,$udom); - my $cookie=&Apache::lonauth::success($r,$uname,$udom,$home,'noredirect'); + if ($data{'ip'} ne $ENV{'REMOTE_ADDR'} || !defined($data{'username'}) || + !defined($data{'domain'}) ) { + return &goto_login($r); + } + + &Apache::lonnet::logthis("Allowing access for $data{'username'}\@$data{'domain'} to $data{'role'}"); + my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); + if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); } + + if (!$data{'role'}) { + &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, + $home,'/adm/roles'); + return OK; + } + + my $cookie=&Apache::lonauth::success($r,$data{'username'},$data{'domain'}, + $home,'noredirect'); $r->header_out('Set-cookie',"lonID=$cookie; path=/"); &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), $cookie); $env{'form.selectrole'}='1'; - $env{'form.'.$role}='1'; + $env{'form.'.$data{'role'}}='1'; return &Apache::lonroles::handler($r); }