[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonremote.pm

[www]

www		Thu Apr  3 09:44:01 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonremote.pm 
  Log:
  lonremote can now actually launch and collapse the Remote
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.50 loncom/interface/lonmenu.pm:1.51
--- loncom/interface/lonmenu.pm:1.50	Wed Apr  2 22:08:12 2003
+++ loncom/interface/lonmenu.pm	Thu Apr  3 09:44:01 2003
@@ -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.51 2003/04/03 14:44:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -640,7 +640,8 @@
 }
 
 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 (<<ENDUTILITY)
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.4 loncom/interface/lonremote.pm:1.5
--- loncom/interface/lonremote.pm:1.4	Wed Apr  2 22:08:12 2003
+++ loncom/interface/lonremote.pm	Thu Apr  3 09:44:01 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.4 2003/04/03 03:08:12 www Exp $
+# $Id: lonremote.pm,v 1.5 2003/04/03 14:44:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,7 @@
 $bodytag
 $setflags
 $windowinfo
+$maincall
 </body>
 </html>
 ENDLAUNCH
@@ -86,7 +87,8 @@
 
 sub handler {
     my $r = shift;
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['action','url']);
     unless ($ENV{'form.action'}) {
 	if ($ENV{'environment.remote'} eq 'on') {
 	    $ENV{'form.action'}='collapse';
@@ -94,9 +96,9 @@
 	    $ENV{'form.action'}='launch';
         }
     }
-# FIXME - testurl
-    my $lowerurl='/adm/roles';
-###
+
+    my $lowerurl=$ENV{'form.url'};
+
     if ($ENV{'form.action'} eq 'launch') {
 	&launchremote($r,$lowerurl);
     } else {