--- loncom/interface/lonmenu.pm	2001/12/19 17:17:46	1.11
+++ loncom/interface/lonmenu.pm	2002/05/24 20:32:48	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.11 2001/12/19 17:17:46 albertel Exp $
+# $Id: lonmenu.pm,v 1.21 2002/05/24 20:32:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@
 # 05/29/00,05/30 Gerd Kortemeyer)
 #
 # 10/05,05/28,05/30,06/01,06/08,06/09,07/04,08/07 Gerd Kortemeyer
+# 02/15/02 Matthew Hall
 
 package Apache::lonmenu;
 
@@ -41,11 +42,15 @@ use vars qw(@desklines $readdesk);
 # =============================================================== Open the menu
 
 sub open {
+#    return(<<ENDOPEN);
+#if (window.screen) {
+#    self.resizeTo(screen.availWidth-215,screen.availHeight-30);
+#    self.moveTo(190,15);
+#}
     return(<<ENDOPEN);
 <script>
-window.status='MenuControl:nologout';
-menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
-                 "height=350,width=150,scrollbars=no,menubar=no");
+var menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
+"height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 </script>
 ENDOPEN
 }
@@ -54,9 +59,10 @@ ENDOPEN
 
 sub switchmenu {
     my ($row,$col,$imgsrc,$texttop,$textbot,$action)=@_;
+    my $openwin=&openmenu();
     return(<<ENDSMENU);
 <script>
-   swmenu=window.open('','LONCAPAmenu');
+   var swmenu=$openwin
    swmenu.switchbutton($row,$col,"$imgsrc","$texttop","$textbot","$action");
 </script>
 ENDSMENU
@@ -91,8 +97,17 @@ sub secondlevel {
     return $output;
 }
 
+sub openmenu {
+    if ($ENV{'browser.type'} eq 'explorer') {
+       return "window.open('javascript:void(0);','LONCAPAmenu');";
+   } else {
+       return "window.open('','LONCAPAmenu');";
+   }
+}
+
 sub rawconfig {
-    my $output="swmenu=window.open('','LONCAPAmenu');";
+    my $r = shift;
+    my $output="var swmenu=".&openmenu();
     my $uname=$ENV{'user.name'};
     my $udom=$ENV{'user.domain'};
     my $adv=$ENV{'user.adv'};
@@ -108,7 +123,7 @@ sub rawconfig {
     my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};
-    map {
+    foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
@@ -135,17 +150,27 @@ sub rawconfig {
         } elsif ($pro eq 'author') {
             if ($author) {
                 if (($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) {
+                    # Check that we are on the correct machine
 		    my ($cadom,$caname)=
                                ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
-                    $output.=switch($caname,$cadom,
-                                    $row,$col,$img,$top,$bot,$act);
+                    my $home = &Apache::lonnet::homeserver($caname,$cadom);
+                    if ($home eq $r->dir_config('lonHostID')) {
+                        $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);
+                    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);
+                    }
                 }
             }
         }
-    } @desklines;
+    }
+    $output.="swmenu.clock.setTime(1000*".time.");";
     return $output;
 }
 
@@ -154,7 +179,6 @@ sub rawconfig {
 sub close {
     return(<<ENDCLOSE);
 <script>
-window.status='MenuControl:nologout';
 menu=window.open("/adm/rat/empty.html","LONCAPAmenu",
                  "height=350,width=150,scrollbars=no,menubar=no");
 menu.close();
@@ -170,18 +194,23 @@ sub footer {
 
 # ================================================================ Main Program
 
-sub BEGIN {
-  unless ($readdesk) {
-  {
+BEGIN {
+  if (! defined($readdesk)) {
+   {
     my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
 				  '/mydesk.tab');
     while (my $configline=<$config>) {
+       $configline=(split(/\#/,$configline))[0];
+       $configline=~s/^\s+//;
        chomp($configline);
-       $desklines[$#desklines+1]=$configline;
+       if ($configline) {
+          $desklines[$#desklines+1]=$configline;
+       }
     }
+   }
+   $readdesk='done';
   }
 }
-}
 1;
 __END__