--- loncom/auth/migrateuser.pm	2006/06/02 19:38:21	1.7
+++ loncom/auth/migrateuser.pm	2008/09/15 19:08:44	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.7 2006/06/02 19:38:21 albertel Exp $
+# $Id: migrateuser.pm,v 1.14 2008/09/15 19:08:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,10 +51,15 @@ sub goto_login {
 
 sub sso_check {
     my ($data) = @_;
+    my %extra_env;
     if ($data->{'sso.login'}) {
-	&Apache::lonnet::appenv(('request.sso.login' =>
-				 $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 {
@@ -62,6 +67,9 @@ sub handler {
     
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
     my %data =   &Apache::lonnet::tmpget($env{'form.token'});
+    if (keys(%data) == 0) {
+        return &goto_login($r);
+    }
     my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
 
     &Apache::lonlocal::get_language_handle($r);
@@ -79,19 +87,38 @@ 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');
-	&sso_check(\%data);
+	my $handle = &Apache::lonnet::check_for_valid_session($r);
+	if ($handle) {
+	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+						     $handle);
+            if ($data{'origurl'} ne '') {
+                $r->internal_redirect($data{'origurl'});
+            } elsif ($env{'request.course.id'}) {
+                $r->internal_redirect('/adm/navmaps');
+	    } else {
+		$r->internal_redirect('/adm/roles');
+	    }
+	} else {
+            my $desturl = '/adm/roles';
+            if ($data{'origurl'} ne '') {
+                $desturl = $data{'origurl'};
+            }
+	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
+				      $home,$desturl,$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);
-    &sso_check(\%data);
+			      $next_url,$extra_env);
     return OK;
 }