[LON-CAPA-cvs] cvs: loncom /auth loncacc.pm /interface lonremote.pm /publisher lonconstruct.pm

raeburn lon-capa-cvs@mail.lon-capa.org
Fri, 29 Oct 2004 20:44:30 -0000 

raeburn		Fri Oct 29 16:44:30 2004 EDT

  Modified files:              
    /loncom/publisher	lonconstruct.pm 
    /loncom/interface	lonremote.pm 
    /loncom/auth	loncacc.pm 
  Log:
  Eliminate requirement for Remote Control when entering Construction Space.
  
  
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.23 loncom/publisher/lonconstruct.pm:1.24
--- loncom/publisher/lonconstruct.pm:1.23	Fri Oct 29 14:40:40 2004
+++ loncom/publisher/lonconstruct.pm	Fri Oct 29 16:44:30 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Page Wrapper for Construction
 #
-# $Id: lonconstruct.pm,v 1.23 2004/10/29 18:40:40 raeburn Exp $
+# $Id: lonconstruct.pm,v 1.24 2004/10/29 20:44:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@
 
 
 use strict;
-use Apache::Constants qw(:common :http :methods REDIRECT);
+use Apache::Constants qw(:common :http :methods);
 use Apache::lonnet;
 use Apache::Log ();
 use HTML::Entities();
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.14 loncom/interface/lonremote.pm:1.15
--- loncom/interface/lonremote.pm:1.14	Thu Oct 28 12:25:21 2004
+++ loncom/interface/lonremote.pm	Fri Oct 29 16:44:30 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.14 2004/10/28 16:25:21 albertel Exp $
+# $Id: lonremote.pm,v 1.15 2004/10/29 20:44:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,9 +72,6 @@
     my $windowinfo=&Apache::lonmenu::close();
 #    my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'">';
     my $message='<p>'.&mt("The external menu (Remote Control) has been disabled, and you will be working with the smaller inline menu.\nYou may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser.\nTo use the Remote Control, disable the filter for this site, and re-launch the Remote Control from the inline menu.").'</p>'; 
-    if ($ENV{'request.role'} =~ /^(ca|au)\./) {
-	$message.='<p>'.&mt(" Authoring roles <b>require</b> use of the remote control. In order to Author you will need to disable popups filtering for this site.").'</p>';
-    }
     $r->print(<<ENDCOLLAPSE);
 <html>
 <head>
Index: loncom/auth/loncacc.pm
diff -u loncom/auth/loncacc.pm:1.36 loncom/auth/loncacc.pm:1.37
--- loncom/auth/loncacc.pm:1.36	Mon Aug 23 14:58:20 2004
+++ loncom/auth/loncacc.pm	Fri Oct 29 16:44:30 2004
@@ -2,7 +2,7 @@
 # Cookie Based Access Handler for Construction Area
 # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
 #
-# $Id: loncacc.pm,v 1.36 2004/08/23 18:58:20 albertel Exp $
+# $Id: loncacc.pm,v 1.37 2004/10/29 20:44:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,15 +102,6 @@
                 $r->log_reason("Unauthorized $requrl", $r->filename); 
 	        return HTTP_NOT_ACCEPTABLE;
             }
-# Construction space needs Remote to work
-            if ($ENV{'environment.remote'} eq 'off') {
-	        $r->content_type('text/html');
-                $r->header_out(Location => 
-                    'http://'.$r->server->server_hostname.
-                    '/adm/remote?action=launch&url='.
-                    &Apache::lonnet::escape($requrl));
-                return REDIRECT;
-            }
 
 # -------------------------------------------------------- Load POST parameters