--- loncom/auth/migrateuser.pm 2005/12/28 19:26:02 1.4 +++ loncom/auth/migrateuser.pm 2006/07/05 18:37:41 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.4 2005/12/28 19:26:02 albertel Exp $ +# $Id: migrateuser.pm,v 1.9 2006/07/05 18:37:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,33 +29,35 @@ package Apache::migrateuser; use strict; +use LONCAPA; use Apache::Constants qw(:common :http :methods); use Apache::lonauth; use Apache::lonnet; +use Apache::lonlocal; 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 + $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 sso_check { + my ($data) = @_; + my %extra_env; + if ($data->{'sso.login'}) { + $extra_env{'request.sso.login'} = $data->{'sso.login'}; + } + return \%extra_env; +} + sub handler { my ($r) = @_; @@ -63,6 +65,8 @@ sub handler { my %data = &Apache::lonnet::tmpget($env{'form.token'}); my $delete = &Apache::lonnet::tmpdel($env{'form.token'}); + &Apache::lonlocal::get_language_handle($r); + if ($delete ne 'ok') { return &goto_login($r); } @@ -76,20 +80,20 @@ sub handler { my $home=&Apache::lonnet::homeserver($data{'username'},$data{'domain'}); if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r); } + my $extra_env = &sso_check(\%data); + if (!$data{'role'}) { &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, - $home,'/adm/roles'); + $home,'/adm/roles',$extra_env); return OK; } + + my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; + - 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.'.$data{'role'}}='1'; - return &Apache::lonroles::handler($r); + &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, + $next_url,$extra_env); + return OK; } 1;