--- loncom/auth/lonroles.pm 2004/07/21 19:54:43 1.95
+++ loncom/auth/lonroles.pm 2004/08/23 18:57:16 1.98
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.95 2004/07/21 19:54:43 albertel Exp $
+# $Id: lonroles.pm,v 1.98 2004/08/23 18:57:16 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,8 +46,11 @@ sub redirect_user {
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();
+ my $navwindow;
if ($launch_nav eq 'on') {
- $swinfo.=&Apache::lonnavmaps::launch_win('now','no');
+ $navwindow.=&Apache::lonnavmaps::launch_win('now');
+ } else {
+ $navwindow.=&Apache::lonnavmaps::close();
}
my $bodytag=&Apache::loncommon::bodytag('Switching Role');
# Note to style police:
@@ -59,9 +62,10 @@ sub redirect_user {
$bodytag
-
+$navwindow
$msg
Continue
@@ -80,7 +84,6 @@ sub handler {
# ================================================================== Roles Init
-
if ($ENV{'form.selectrole'}) {
if ($ENV{'request.course.id'}) {
my %temp=('logout_'.$ENV{'request.course.id'} => time);
@@ -457,7 +460,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};
@@ -481,7 +484,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};