--- loncom/interface/lonmenu.pm 2003/04/03 03:08:12 1.50 +++ loncom/interface/lonmenu.pm 2003/04/03 15:23:41 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.50 2003/04/03 03:08:12 www Exp $ +# $Id: lonmenu.pm,v 1.52 2003/04/03 15:23:41 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -364,6 +364,8 @@ sub startupremote { # The Remote actually gets launched! # my $configmenu=&rawconfig(); + my $esclowerurl=&Apache::lonnet::escape($lowerurl); + return(< @@ -393,7 +395,7 @@ function wait() { $configmenu window.location='$lowerurl'; } else { - alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters."); + window.location='/adm/remote?action=collapse&url=$esclowerurl'; } } else { wheelswitch(); @@ -402,7 +404,7 @@ function wait() { } function main() { - canceltim=setTimeout('tim=1;',60000); + canceltim=setTimeout('tim=1;',30000); window.status='-'; wait(); } @@ -640,7 +642,8 @@ sub footer { } sub utilityfunctions { - unless ($ENV{'browser.interface'} eq 'textual') { return ''; } + unless (($ENV{'browser.interface'} eq 'textual') || + ($ENV{'environment.remote'} eq 'off')) { return ''; } my $currenturl=$ENV{'REQUEST_URI'}; my $currentsymb=$ENV{'request.symb'}; return (<