--- loncom/auth/migrateuser.pm 2006/04/05 22:39:55 1.5 +++ loncom/auth/migrateuser.pm 2006/05/15 17:45:46 1.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.5 2006/04/05 22:39:55 albertel Exp $ +# $Id: migrateuser.pm,v 1.6 2006/05/15 17:45:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,9 +29,11 @@ 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) = @_; @@ -54,6 +56,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); } @@ -72,15 +76,13 @@ sub handler { $home,'/adm/roles'); 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); + return OK; } 1;