[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth lonroles.pm /homework lonhomework.pm /interface lonfeedback.pm rat lonpageflip.pm

[albertel]

albertel		Mon Sep 15 17:50:49 2003 EDT

  Modified files:              
    /rat	lonpageflip.pm 
    /loncom/auth	lonroles.pm 
    /loncom/homework	lonhomework.pm 
    /loncom/interface	lonfeedback.pm 
    /loncom	loncapa_apache.conf 
  Log:
  - maybe this is better, should fix 2190
  
  
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.42 rat/lonpageflip.pm:1.43
--- rat/lonpageflip.pm:1.42	Thu Sep 11 16:03:28 2003
+++ rat/lonpageflip.pm	Mon Sep 15 17:50:49 2003
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.42 2003/09/11 20:03:28 albertel Exp $
+# $Id: lonpageflip.pm,v 1.43 2003/09/15 21:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,7 +388,7 @@
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-	  if ( Apache::exists_config_define("MODPERL2") ) {
+	  if ( $Apache::lonnet::perlvar{'MODPERL2'} ) {
 	      &Apache::lonnet::cleanenv();
 	  }
 	  $r->internal_redirect('/adm/ambiguous');
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.68 loncom/auth/lonroles.pm:1.69
--- loncom/auth/lonroles.pm:1.68	Mon Sep 15 14:43:53 2003
+++ loncom/auth/lonroles.pm	Mon Sep 15 17:50:49 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.68 2003/09/15 18:43:53 www Exp $
+# $Id: lonroles.pm,v 1.69 2003/09/15 21:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -172,9 +172,9 @@
 			if (($ENV{'form.orgurl'}) && 
 			    ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$ENV{'form.orgurl'};
-
+			    if ( $Apache::lonnet::perlvar{'MODPERL2'} ) {
 				&Apache::lonnet::cleanenv();
-
+			    }
 			    $r->internal_redirect($dest);
 			    return OK;
 			} else {
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.141 loncom/homework/lonhomework.pm:1.142
--- loncom/homework/lonhomework.pm:1.141	Mon Sep 15 14:43:53 2003
+++ loncom/homework/lonhomework.pm	Mon Sep 15 17:50:49 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.141 2003/09/15 18:43:53 www Exp $
+# $Id: lonhomework.pm,v 1.142 2003/09/15 21:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -660,9 +660,9 @@
     # if we are browsing we might not be able to know where we are
     if ($Apache::lonhomework::browse ne 'F') {
       #should know where we are, so ask
-
+	if ( $Apache::lonnet::perlvar{'MODPERL2'} ) {
 	    &Apache::lonnet::cleanenv();
-
+	}
 	$request->internal_redirect('/adm/ambiguous'); return;
     }
   }
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.57 loncom/interface/lonfeedback.pm:1.58
--- loncom/interface/lonfeedback.pm:1.57	Mon Sep 15 15:56:44 2003
+++ loncom/interface/lonfeedback.pm	Mon Sep 15 17:50:49 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.57 2003/09/15 19:56:44 www Exp $
+# $Id: lonfeedback.pm,v 1.58 2003/09/15 21:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -737,9 +737,9 @@
    }
   } else {
 # Ambiguous Problem Resource
-
+      if ( $Apache::lonnet::perlvar{'MODPERL2'} ) {
 	  &Apache::lonnet::cleanenv();
-
+      }
       $r->internal_redirect('/adm/ambiguous');
   }
 }
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.62 loncom/loncapa_apache.conf:1.63
--- loncom/loncapa_apache.conf:1.62	Thu Sep 11 15:47:30 2003
+++ loncom/loncapa_apache.conf	Mon Sep 15 17:50:49 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.62 2003/09/11 19:47:30 www Exp $
+## $Id: loncapa_apache.conf,v 1.63 2003/09/15 21:50:49 albertel Exp $
 ##
 
 #
@@ -23,6 +23,9 @@
 AddModule mod_perl.c
 </IfDefine>
 
+<IfDefine MODPERL2>
+PerlSetVar	MODPERL2	1
+</IfDefine>
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu