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

[albertel]

albertel		Thu Sep 11 16:03:28 2003 EDT

  Modified files:              
    /rat	lonpageflip.pm 
    /loncom/auth	lonroles.pm 
    /loncom/homework	lonhomework.pm 
    /loncom/interface	lonfeedback.pm 
  Log:
  - mod_perl 2 isms
  
  
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.41 rat/lonpageflip.pm:1.42
--- rat/lonpageflip.pm:1.41	Tue Sep  9 14:46:28 2003
+++ rat/lonpageflip.pm	Thu Sep 11 16:03:28 2003
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.41 2003/09/09 18:46:28 www Exp $
+# $Id: lonpageflip.pm,v 1.42 2003/09/11 20:03:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,7 +388,10 @@
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-         $r->internal_redirect('/adm/ambiguous');
+	  if ( Apache::exists_config_define("MODPERL2") ) {
+	      &Apache::lonnet::cleanenv();
+	  }
+	  $r->internal_redirect('/adm/ambiguous');
       }
   } else {
 # -------------------------- Class was not initialized or page fliped strangely
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.66 loncom/auth/lonroles.pm:1.67
--- loncom/auth/lonroles.pm:1.66	Tue Aug 12 15:46:04 2003
+++ loncom/auth/lonroles.pm	Thu Sep 11 16:03:28 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.66 2003/08/12 19:46:04 www Exp $
+# $Id: lonroles.pm,v 1.67 2003/09/11 20:03:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,7 +171,11 @@
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($ENV{'form.orgurl'}) && 
 			    ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
-			    $r->internal_redirect($ENV{'form.orgurl'});
+			    my $dest=$ENV{'form.orgurl'};
+			    if ( Apache::exists_config_define("MODPERL2") ) {
+				&Apache::lonnet::cleanenv();
+			    }
+			    $r->internal_redirect($dest);
 			    return OK;
 			} else {
 			    unless ($ENV{'request.course.id'}) {
@@ -179,7 +183,7 @@
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-	 '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>';
+	 '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>'.$ferr;
 			    }
 
 			    # Check to see if the user is a CC entering a course 
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.139 loncom/homework/lonhomework.pm:1.140
--- loncom/homework/lonhomework.pm:1.139	Tue Sep  9 09:32:25 2003
+++ loncom/homework/lonhomework.pm	Thu Sep 11 16:03:28 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.139 2003/09/09 13:32:25 sakharuk Exp $
+# $Id: lonhomework.pm,v 1.140 2003/09/11 20:03:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -660,7 +660,10 @@
     # 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
-      $request->internal_redirect('/adm/ambiguous'); return;
+	if ( Apache::exists_config_define("MODPERL2") ) {
+	    &Apache::lonnet::cleanenv();
+	}
+	$request->internal_redirect('/adm/ambiguous'); return;
     }
   }
 
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.52 loncom/interface/lonfeedback.pm:1.53
--- loncom/interface/lonfeedback.pm:1.52	Tue Sep  9 14:46:28 2003
+++ loncom/interface/lonfeedback.pm	Thu Sep 11 16:03:28 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.52 2003/09/09 18:46:28 www Exp $
+# $Id: lonfeedback.pm,v 1.53 2003/09/11 20:03:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -620,7 +620,10 @@
    }
   } else {
 # Ambiguous Problem Resource
-    $r->internal_redirect('/adm/ambiguous');
+      if ( Apache::exists_config_define("MODPERL2") ) {
+	  &Apache::lonnet::cleanenv();
+      }
+      $r->internal_redirect('/adm/ambiguous');
   }
 }
   return OK;