--- loncom/auth/lonroles.pm	2004/10/11 18:27:49	1.94.2.2
+++ loncom/auth/lonroles.pm	2004/07/21 19:54:43	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.94.2.2 2004/10/11 18:27:49 albertel Exp $
+# $Id: lonroles.pm,v 1.95 2004/07/21 19:54:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,12 +40,15 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 
 sub redirect_user {
-    my ($r,$title,$url,$msg) = @_;
+    my ($r,$title,$url,$msg,$launch_nav) = @_;
     $msg = $title if (! defined($msg));
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     my $swinfo=&Apache::lonmenu::rawconfig();
+    if ($launch_nav eq 'on') {
+	$swinfo.=&Apache::lonnavmaps::launch_win('now','no');
+    }
     my $bodytag=&Apache::loncommon::bodytag('Switching Role');
 # Note to style police: 
 # This must only replace the spaces, nothing else, or it bombs elsewhere.
@@ -247,7 +250,8 @@ ENDENTERKEY
                             #
                             # Send the user to the course they selected
                             &redirect_user($r,&mt('Entering Course'),
-                                           $furl,$msg);
+                                           $furl,$msg,
+					   $ENV{'environment.remotenavmap'});
                             return OK;
 			}
 		    }
@@ -453,7 +457,7 @@ ENDHEADER
                          $Apache::lonnet::hostname{$home}.
                          '/adm/login?domain='.$ENV{'user.domain'}.
 			  '&username='.$ENV{'user.name'}.
-                          '&firsturl=/priv/'.$trest.'/');
+                          '&firsturl=/priv/'.$trest);
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -477,7 +481,7 @@ ENDHEADER
                          $Apache::lonnet::hostname{$home}.
                           '/adm/login?domain='.$ENV{'user.domain'}.
 			   '&username='.$ENV{'user.name'}.
-                           '&firsturl=/priv/'.$ENV{'user.name'}.'/');
+                           '&firsturl=/priv/'.$ENV{'user.name'});
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};