--- loncom/auth/lonroles.pm	2005/12/19 21:39:33	1.139
+++ loncom/auth/lonroles.pm	2006/03/16 19:19:59	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.139 2005/12/19 21:39:33 raeburn Exp $
+# $Id: lonroles.pm,v 1.146 2006/03/16 19:19:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub redirect_user {
     my $navwindow;
     if ($launch_nav eq 'on') {
 	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						  ($url =~ m-/^adm/whatsnew-));
+						  ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -108,10 +108,10 @@ sub handler {
 # Check if user is a DC trying to enter a course and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
-                if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) {
-                    if ($dcroles{$1}) {
-                        my $cckey = 'user.role.cc./'.$1.'/'.$2;
-                        &check_privs($cckey,$then,$now);
+                if (my ($domain,$coursenum) =
+                                    ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-)) {
+                    if ($dcroles{$domain}) {
+                        &check_privs($domain,$coursenum,$then,$now);
                     }
                     last;
                 }
@@ -271,8 +271,13 @@ ENDENTERKEY
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
 				# Send the user to the course they selected
-			    } elsif ($env{'request.course.fn'}) {
-                                if ($env{'user.adv'}) {
+			    } elsif ($env{'request.course.id'}) {
+                                if (&Apache::lonnet::allowed('whn',
+                                                  $env{'request.course.id'})
+				    || &Apache::lonnet::allowed('whn',
+					       $env{'request.course.id'}.'/'
+					      .$env{'request.course.sec'})
+				    ) {
                                     my $startpage = &courseloadpage($courseid);
                                     unless ($startpage eq 'firstres') {         
 				        $msg = &mt('Entering course ....');
@@ -530,11 +535,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                          '/adm/login?domain='.$env{'user.domain'}.
-			   '&username='.$env{'user.name'}.
-                           '&firsturl=/priv/'.$env{'user.name'}.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -846,15 +847,16 @@ sub build_roletext {
 }
 
 sub check_privs {
-    my ($cckey,$then,$now) = @_;
+    my ($cdom,$cnum,$then,$now) = @_;
+    my $cckey = 'user.role.cc./'.$cdom.'/'.$cnum; 
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
         &role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
-            &set_privileges($1,$2);
+            &set_privileges($cdom,$cnum);
         }
     } else {
-        &set_privileges($1,$2);
+        &set_privileges($cdom,$cnum);
     }
 }
 
@@ -1021,7 +1023,7 @@ sub set_privileges {
                          $env{'user.home'},
                         "Role ".$role);
     &Apache::lonnet::appenv(
-                          'request.role'        => $role,
+                          'request.role'        => $spec,
                           'request.role.domain' => $dcdom,
                           'request.course.sec'  => '');
     my $tadv=0;
@@ -1032,11 +1034,10 @@ sub set_privileges {
 sub courseloadpage {
     my ($courseid) = @_;
     my $startpage;
-    my %entry_settings =
-              &Apache::lonnet::dump('nohist_whatsnew',$env{'user.domain'},
-                                    $env{'user.name'},$courseid.':courseinit');
+    my %entry_settings = &Apache::lonnet::get('nohist_whatsnew',
+					      [$courseid.':courseinit']);
     my ($tmp) = %entry_settings;
-    unless ($tmp =~ /^Error/) {
+    unless ($tmp =~ /^error: 2 /) {
         $startpage = $entry_settings{$courseid.':courseinit'};
     }
     if ($startpage eq '') {