--- loncom/interface/lonmenu.pm	2001/06/02 16:10:44	1.4
+++ loncom/interface/lonmenu.pm	2001/10/05 16:49:02	1.9
@@ -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;
 
@@ -73,8 +73,14 @@ sub rawconfig {
     my $udom=$ENV{'user.domain'};
     my $adv=$ENV{'user.adv'};
     my $author=$ENV{'user.author'};
-    my $crs='/'.$ENV{'request.course.id'};
-    $crs=~s/\_/\//;
+    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'};
@@ -82,7 +88,7 @@ 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') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
@@ -104,6 +110,15 @@ sub rawconfig {
             }
         } 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;
@@ -132,16 +147,18 @@ sub footer {
 # ================================================================ Main Program
 
 sub BEGIN {
-if ($readdesk ne 'done') {
-  {
-    my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-                                 '/mydesk.tab');
-    while (my $configline=<$config>) {
-       chomp($configline);
-       $desklines[$#desklines+1]=$configline;
+    if ($readdesk) {
+	if ($readdesk ne 'done') {
+	    {
+		my $config=Apache::File->new($Apache::lonnet::perlvar{
+		    'lonTabDir'}.'/mydesk.tab');
+		while (my $configline=<$config>) {
+		    chomp($configline);
+		    $desklines[$#desklines+1]=$configline;
+		}
+	    }
+	}
     }
-  }
-}
 }
 1;
 __END__