--- loncom/auth/lonroles.pm	2004/08/03 18:53:27	1.97
+++ loncom/auth/lonroles.pm	2004/11/02 23:22:46	1.101
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.97 2004/08/03 18:53:27 albertel Exp $
+# $Id: lonroles.pm,v 1.101 2004/11/02 23:22:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,12 +84,12 @@ sub handler {
 
 
 # ================================================================== Roles Init
-
     if ($ENV{'form.selectrole'}) {
 	if ($ENV{'request.course.id'}) {
 	    my %temp=('logout_'.$ENV{'request.course.id'} => time);
 	    &Apache::lonnet::put('email_status',\%temp);
-        }
+	    &Apache::lonnet::delenv('user.state.'.$ENV{'request.course.id'});
+	}
 	&Apache::lonnet::appenv("request.course.id"   => '',
 				"request.course.fn"   => '',
 				"request.course.uri"  => '',
@@ -207,15 +207,15 @@ ENDENTERKEY
 					 $ENV{'user.name'},
 					 $ENV{'user.home'},
 					 "Role ".$trolecode);
-                    my $tadv=0;
-                    if (($trolecode!~/^st/) && 
-                        ($trolecode!~/^ta/) && 
-                        ($trolecode!~/^cm/)) { $tadv=1; }
+		    
 		    &Apache::lonnet::appenv(
-                                           'request.role'        => $trolecode,
-					   'request.role.adv'    => $tadv,
+					   'request.role'        => $trolecode,
 					   'request.role.domain' => $cdom,
 					   'request.course.sec'  => $csec);
+                    my $tadv=0;
+		    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+		    &Apache::lonnet::appenv('request.role.adv'    => $tadv);
+
 		    my $msg=&mt('Entering course ...');
 
 		    if (($cnum) && ($role ne 'ca')) {
@@ -606,7 +606,7 @@ ENDHEADER
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
     $r->print('<th>'.&mt('User Role').'</th><th colspan=2>'.&mt('Extent').
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
-	      &mt('Remark').'</th></tr>'."\n");
+	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
     my $doheaders=-1;
     foreach my $type ('Construction Space','Course','Domain','System') {
 	my $haverole=0;
@@ -621,7 +621,7 @@ ENDHEADER
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
-		$output.=&mt($roletext{$sortrole{$which}});
+		$output.=$roletext{$sortrole{$which}};
 	    }
 	}
 	if ($output) {