--- loncom/auth/migrateuser.pm 2006/05/15 17:45:46 1.6 +++ loncom/auth/migrateuser.pm 2007/01/12 15:44:27 1.10 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.6 2006/05/15 17:45:46 albertel Exp $ +# $Id: migrateuser.pm,v 1.10 2007/01/12 15:44:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,6 +49,19 @@ sub goto_login { } +sub sso_check { + my ($data) = @_; + my %extra_env; + if ($data->{'sso.login'}) { + $extra_env{'request.sso.login'} = $data->{'sso.login'}; + } + if ($data->{'sso.reloginserver'}) { + $extra_env{'request.sso.reloginserver'} = + $data->{'sso.reloginserver'}; + } + return \%extra_env; +} + sub handler { my ($r) = @_; @@ -71,9 +84,11 @@ 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; } @@ -81,7 +96,7 @@ sub handler { &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, - $next_url); + $next_url,$extra_env); return OK; }