--- loncom/interface/lonmenu.pm 2001/06/01 17:19:20 1.3 +++ loncom/interface/lonmenu.pm 2001/08/07 21:47:34 1.8 @@ -5,7 +5,7 @@ # # 05/29/00,05/30 Gerd Kortemeyer) # -# 10/05,05/28,05/30,06/01 Gerd Kortemeyer +# 10/05,05/28,05/30,06/01,06/08,06/09,07/04,08/07 Gerd Kortemeyer package Apache::lonmenu; @@ -72,8 +72,15 @@ sub rawconfig { my $uname=$ENV{'user.name'}; my $udom=$ENV{'user.domain'}; my $adv=$ENV{'user.adv'}; - my $crs='/'.$ENV{'request.course.id'}; - $crs=~s/\_/\//; + my $author=$ENV{'user.author'}; + my $crs=''; + if ($ENV{'request.course.id'}) { + $crs='/'.$ENV{'request.course.id'}; + if ($ENV{'request.course.sec'}) { + $crs.='_'.$ENV{'request.course.sec'}; + } + $crs=~s/\_/\//g; + } my $pub=($ENV{'request.state'} eq 'published'); my $con=($ENV{'request.state'} eq 'construct'); my $rol=$ENV{'request.role'}; @@ -81,9 +88,9 @@ sub rawconfig { my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; - $prt=~s/\$crs/$crs/g; + $prt=~s/\$crs/$crs/g; if ($pro eq 'clear') { - &clear($row,$col); + $output.=&clear($row,$col); } elsif ($pro eq 'any') { $output.=&secondlevel( $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act); @@ -101,6 +108,18 @@ sub rawconfig { if (&Apache::lonnet::allowed($1,$prt)) { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act); } + } elsif ($pro eq 'author') { + if ($author) { + if (($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) { + my ($cadom,$caname)= + ($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + $output.=switch($caname,$cadom, + $row,$col,$img,$top,$bot,$act); + } elsif ($prt eq 'any') { + $output.=switch($ENV{'user.name'},$ENV{'user.domain'}, + $row,$col,$img,$top,$bot,$act); + } + } } } @desklines; return $output;