--- loncom/auth/migrateuser.pm	2006/04/05 22:39:55	1.5
+++ loncom/auth/migrateuser.pm	2007/10/01 21:52:50	1.12
@@ -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.12 2007/10/01 21:52:50 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,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) = @_;
     
@@ -54,6 +69,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);
     }
@@ -67,20 +84,33 @@ 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');
+	my $handle = &Apache::lonnet::check_for_valid_session($r);
+	if ($handle) {
+	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+						     $handle);
+	    if ($env{'request.course.id'}) {
+		$r->internal_redirect('/adm/navmaps');
+	    } else {
+		$r->internal_redirect('/adm/roles');
+	    }
+	} else {
+	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
+				      $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;