--- loncom/auth/migrateuser.pm	2006/04/05 22:39:55	1.5
+++ loncom/auth/migrateuser.pm	2006/06/02 19:38:21	1.7
@@ -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.7 2006/06/02 19:38:21 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) = @_;
@@ -47,6 +49,14 @@ sub goto_login {
 }
 
 
+sub sso_check {
+    my ($data) = @_;
+    if ($data->{'sso.login'}) {
+	&Apache::lonnet::appenv(('request.sso.login' =>
+				 $data->{'sso.login'} ));
+    }
+}
+
 sub handler {
     my ($r) = @_;
     
@@ -54,6 +64,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);
     }
@@ -70,17 +82,17 @@ sub handler {
     if (!$data{'role'}) {
 	&Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				  $home,'/adm/roles');
+	&sso_check(\%data);
 	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);
+    &sso_check(\%data);
+    return OK;
 }
 
 1;