--- loncom/auth/migrateuser.pm	2007/09/29 02:09:50	1.11
+++ 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.11 2007/09/29 02:09:50 albertel Exp $
+# $Id: migrateuser.pm,v 1.14 2008/09/15 19:08:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,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);
@@ -87,26 +90,24 @@ sub handler {
     my $extra_env = &sso_check(\%data);
 
     if (!$data{'role'}) {
-	# check for exisiting valid session 
-	my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-	my $lonid=$cookies{'lonID'};
-	my $handle;
-	if ($lonid) {
-	    $handle=&LONCAPA::clean_handle($lonid->value);
-	}
-	if ($lonid 
-	    && -e $r->dir_config('lonIDsDir').'/'.$handle.'.id' 
-	    && $handle ne '') {
+	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');
+            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,'/adm/roles',$extra_env);
+				      $home,$desturl,$extra_env);
 
 	}
 	return OK;