[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm lonauth.pm /interface lonremote.pm

www lon-capa-cvs@mail.lon-capa.org
Thu, 03 Apr 2003 16:50:46 -0000 

www		Thu Apr  3 11:50:46 2003 EDT

  Modified files:              
    /loncom/auth	lonacc.pm lonauth.pm 
    /loncom/interface	lonremote.pm 
  Log:
  Handle login without Remote.
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.40 loncom/auth/lonacc.pm:1.41
--- loncom/auth/lonacc.pm:1.40	Wed Apr  2 09:57:32 2003
+++ loncom/auth/lonacc.pm	Thu Apr  3 11:50:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.40 2003/04/02 14:57:32 www Exp $
+# $Id: lonacc.pm,v 1.41 2003/04/03 16:50:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -228,7 +228,7 @@
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
     if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-        ($requrl=~/^\/adm\/(roles|logout|email)/) ||
+        ($requrl=~/^\/adm\/(roles|logout|email|menu|remote)/) ||
         ($requrl=~m|^/prtspool/|)) {
 # -------------------------- Store where they wanted to go and get login screen
 	$ENV{'request.querystring'}=$r->args;
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.46 loncom/auth/lonauth.pm:1.47
--- loncom/auth/lonauth.pm:1.46	Mon Mar 17 08:41:12 2003
+++ loncom/auth/lonauth.pm	Thu Apr  3 11:50:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.46 2003/03/17 13:41:12 matthew Exp $
+# $Id: lonauth.pm,v 1.47 2003/04/03 16:50:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,6 +106,7 @@
     if (($userenv{'interface'}) && (!$FORM{'interface'})) {
 	$FORM{'interface'}=$userenv{'interface'};
     }
+    $ENV{'environment.remote'}=$userenv{'remote'};
 # --------------------------------------------------------- Write first profile
 
     {
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.5 loncom/interface/lonremote.pm:1.6
--- loncom/interface/lonremote.pm:1.5	Thu Apr  3 09:44:01 2003
+++ loncom/interface/lonremote.pm	Thu Apr  3 11:50:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.5 2003/04/03 14:44:01 www Exp $
+# $Id: lonremote.pm,v 1.6 2003/04/03 16:50:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,10 +71,12 @@
 # -------------------------------------------------------- Menu script and info
     my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control');
     my $windowinfo=&Apache::lonmenu::close();
+    my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'">';
     $r->print(<<ENDCOLLAPSE);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
+$switch
 </head>
 $bodytag
 $windowinfo
@@ -98,6 +100,7 @@
     }
 
     my $lowerurl=$ENV{'form.url'};
+    unless ($lowerurl) { $lowerurl='/adm/menu'; }
 
     if ($ENV{'form.action'} eq 'launch') {
 	&launchremote($r,$lowerurl);