--- loncom/auth/migrateuser.pm	2006/05/15 17:45:46	1.6
+++ 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.6 2006/05/15 17:45:46 albertel Exp $
+# $Id: migrateuser.pm,v 1.12 2007/10/01 21:52:50 albertel 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,17 +84,32 @@ 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';
 
     
     &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-			      $next_url);
+			      $next_url,$extra_env);
     return OK;
 }