--- loncom/auth/migrateuser.pm	2008/03/24 04:56:07	1.13
+++ loncom/auth/migrateuser.pm	2009/07/23 17:40:29	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.13 2008/03/24 04:56:07 raeburn Exp $
+# $Id: migrateuser.pm,v 1.16 2009/07/23 17:40:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,19 +89,30 @@ sub handler {
 
     my $extra_env = &sso_check(\%data);
 
+    my %form;
+    if ($data{'symb'} ne '') {
+        $form{'symb'} = $data{'symb'};
+    }
+
     if (!$data{'role'}) {
 	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,\%form);
 
 	}
 	return OK;
@@ -109,10 +120,11 @@ sub handler {
     }
 
     my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
-
-    
+    if ($data{'origurl'} ne '') {
+        $next_url .= '&orgurl='.&escape($data{'origurl'});
+    }
     &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-			      $next_url,$extra_env);
+			      $next_url,$extra_env,\%form);
     return OK;
 }