--- loncom/auth/lonroles.pm 2003/03/24 18:46:44 1.55 +++ loncom/auth/lonroles.pm 2003/05/21 20:10:53 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.55 2003/03/24 18:46:44 albertel Exp $ +# $Id: lonroles.pm,v 1.57 2003/05/21 20:10:53 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,6 +50,7 @@ use Apache::Constants qw(:common); use Apache::File(); use Apache::lonmenu; use Apache::loncommon; +use Apache::lonannounce; sub handler { @@ -72,6 +73,7 @@ sub handler { "request.course.uri" => '', "request.course.sec" => '', "request.role" => 'cm', + "request.role.adv" => $ENV{'user.adv'}, "request.role.domain" => $ENV{'user.domain'}); foreach $envkey (keys %ENV) { next if ($envkey!~/^user\.role\./); @@ -129,9 +131,15 @@ ENDENTERKEY } } } - &Apache::lonnet::appenv('request.role' => $trolecode, - 'request.role.domain' => $cdom, - 'request.course.sec' => $csec); + my $tadv=0; + if (($trolecode!~/^st/) && + ($trolecode!~/^ta/) && + ($trolecode!~/^cm/)) { $tadv=1; } + &Apache::lonnet::appenv( + 'request.role' => $trolecode, + 'request.role.adv' => $tadv, + 'request.role.domain' => $cdom, + 'request.course.sec' => $csec); my $msg='Entering course ...'; if (($cnum) && ($role ne 'ca')) { my ($furl,$ferr)= @@ -430,6 +438,9 @@ ENDHEADER $r->print(' '); } } + $tremark.=&Apache::lonannounce::showday(time,1, + &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); + $r->print(''.$trole. ''.$ttype. ''.$twhere.