--- loncom/interface/lonmenu.pm	2002/11/18 15:23:32	1.28
+++ loncom/interface/lonmenu.pm	2002/12/06 17:49:49	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.28 2002/11/18 15:23:32 www Exp $
+# $Id: lonmenu.pm,v 1.29 2002/12/06 17:49:49 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,23 +161,21 @@ sub rawconfig {
 	    }
         } elsif ($pro eq 'author') {
             if ($author) {
-                if (($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) {
+                if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
+                    (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) {
                     # Check that we are on the correct machine
-		    my ($cadom,$caname)=
+                    my $cadom=$requested_domain;
+                    my $caname=$ENV{'user.name'};
+                    if ($prt eq 'rca') {
+		       ($cadom,$caname)=
                                ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                    }                       
+                    $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
                     if ($home eq $r->dir_config('lonHostID')) {
                         $output.=switch($caname,$cadom,
                                         $row,$col,$img,$top,$bot,$act,$desc);
                     }
-                } elsif ($prt eq 'any') {
-                    my $home = &Apache::lonnet::homeserver
-                        ($ENV{'user.name'},$ENV{'user.domain'});
-                    if ($home eq $r->dir_config('lonHostID')) {
-                        $output.=switch
-                            ($ENV{'user.name'},$ENV{'user.domain'},
-                             $row,$col,$img,$top,$bot,$act,$desc);
-                    }
                 }
             }
         }