--- loncom/interface/lonmenu.pm	2003/12/09 22:10:23	1.106
+++ loncom/interface/lonmenu.pm	2004/07/02 07:58:01	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.106 2003/12/09 22:10:23 www Exp $
+# $Id: lonmenu.pm,v 1.109 2004/07/02 07:58:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -263,15 +263,14 @@ sub innerregister {
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
-        my $hwkadd='';
-        if 
-      ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    my $crs='/'.$ENV{'request.course.id'};
-	    if ($ENV{'request.course.sec'}) {
-	        $crs.='_'.$ENV{'request.course.sec'};
-	    }
-	    $crs=~s/\_/\//g;
+	my $crs='/'.$ENV{'request.course.id'};
+	if ($ENV{'request.course.sec'}) {
+	    $crs.='_'.$ENV{'request.course.sec'};
+	}
+	$crs=~s/\_/\//g;
 
+        my $hwkadd='';
+        if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$crs)) {
 		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
                        "gocmd('/adm/grades','submission')",
@@ -282,11 +281,11 @@ sub innerregister {
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('opa',$crs)) {
-		$hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
-                       "gocmd('/adm/parmset','set')",
-                       'Modify deadlines, etc, for this assessment resource');
-            }
+	}
+	if (&Apache::lonnet::allowed('opa',$crs)) {
+	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
+			     "gocmd('/adm/parmset','set')",
+			     'Modify deadlines, etc, for this resource');
 	}
 # -- End Homework
         ###
@@ -311,9 +310,11 @@ sub innerregister {
                 }
                 # Check that we are on the correct machine
                 my $home = &Apache::lonnet::homeserver($caname,$cadom);
-                if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
-                    $editbutton=&switch
-                        ('','',6,1,$top,,$bottom,$action,$desc);
+		my $allowed=0;
+		my @ids=&Apache::lonnet::current_machine_ids();
+		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		if (!$allowed) {
+		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
                 }
             }
             ##
@@ -325,16 +326,20 @@ sub innerregister {
             if ($ENV{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
                 $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
-                # Chech that the user has permission to edit this resource
+                # Check that the user has permission to edit this resource
                 ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
                 if (defined($cfudom)) {
-                    if (&Apache::lonnet::homeserver($cfuname,$cfudom) 
-                        eq $Apache::lonnet::perlvar{'lonHostID'}) {
+		    my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		    if ($allowed) {
                         $cfile=$file;
                     }
                 }
             }        
             # Finally, turn the button on or off
+	    &Apache::lonnet::logthis("cfile is $cfile");
             if ($cfile) {
                 $editbutton=&switch
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
@@ -444,7 +449,7 @@ var swmenu=null;
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
       }
 
@@ -811,7 +816,10 @@ sub rawconfig {
                     }                       
                     $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
-                    if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		    if ($allowed) {
                         $output.=switch($caname,$cadom,
                                         $row,$col,$img,$top,$bot,$act,$desc);
                     }