--- loncom/interface/lonmenu.pm	2002/11/18 15:23:32	1.28
+++ loncom/interface/lonmenu.pm	2003/01/31 21:46:36	1.32
@@ -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.32 2003/01/31 21:46:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,11 +38,70 @@ use strict;
 use Apache::lonnet;
 use Apache::File;
 use vars qw(@desklines $readdesk);
- 
+
+# ============================================================= Start up remote
+
+sub startupremote {
+    my ($lowerurl)=@_;
+    my $configmenu=&rawconfig();
+    return(<<ENDREMOTESTARTUP);
+<script>
+
+// ---------------------------------------------------------- The wait function
+var canceltim;
+function wait() {
+   if ((menuloaded==1) || (tim==1)) {
+      if (tim==0) {
+         clearTimeout(canceltim);
+         $configmenu
+         window.location='$lowerurl';  
+      } else {
+         alert("Remote Control Timed Out.");
+      }
+   } else {
+      setTimeout('wait();',100);
+   }
+}
+
+function main() {
+   canceltim=setTimeout('tim=1;',80000);
+   wait();
+}
+
+</script>
+ENDREMOTESTARTUP
+}
+
+sub setflags() {
+    return(<<ENDSETFLAGS);
+<script>
+    menuloaded=0;
+    tim=0;
+</script>
+ENDSETFLAGS
+}
+
+sub maincall() {
+    return(<<ENDMAINCALL);
+<script>
+    main();
+</script>
+ENDMAINCALL
+}
+# ================================================================= Reopen menu
+
+sub reopenmenu {
+   my $nothing='';
+   my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+   if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+   return('window.open("'.$nothing.'","'.$menuname.'","",false);');
+} 
+
 # =============================================================== Open the menu
 
 sub open {
     my $returnval='';
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
        $returnval.=(<<ENDRESIZE);
@@ -53,7 +112,7 @@ if (window.screen) {
 ENDRESIZE
     }
     $returnval.=(<<ENDOPEN);
-var menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
+var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 ENDOPEN
     return '<script>'.$returnval.'</script>';
@@ -104,15 +163,15 @@ sub secondlevel {
 }
 
 sub openmenu {
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     if ($ENV{'browser.type'} eq 'explorer') {
-       return "window.open('javascript:void(0);','LONCAPAmenu');";
+       return "window.open('javascript:void(0);','".$menuname."');";
    } else {
-       return "window.open('','LONCAPAmenu');";
+       return "window.open('','".$menuname."');";
    }
 }
 
 sub rawconfig {
-    my $r = shift;
     my $output="var swmenu=".&openmenu();
     my $uname=$ENV{'user.name'};
     my $udom=$ENV{'user.domain'};
@@ -161,23 +220,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')) {
+                    if ($home eq $Apache::lonnet::perlvar{'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);
-                    }
                 }
             }
         }
@@ -189,10 +246,12 @@ sub rawconfig {
 # ======================================================================= Close
 
 sub close {
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
 <script>
-menu=window.open("/adm/rat/empty.html","LONCAPAmenu",
+menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
+menu.autologout=0;
 menu.close();
 </script>
 ENDCLOSE
@@ -223,6 +282,7 @@ BEGIN {
    $readdesk='done';
   }
 }
+
 1;
 __END__