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

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 17 Sep 2003 18:16:39 -0000


albertel		Wed Sep 17 14:16:39 2003 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
    /loncom/homework	lonhomework.pm 
    /loncom/interface	lonfeedback.pm 
    /rat	lonpageflip.pm 
  Log:
  - stupid typo
  - removing the blind acceptance of the answers target as a form parameter
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.70 loncom/auth/lonroles.pm:1.71
--- loncom/auth/lonroles.pm:1.70	Wed Sep 17 13:50:49 2003
+++ loncom/auth/lonroles.pm	Wed Sep 17 14:16:39 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.70 2003/09/17 17:50:49 albertel Exp $
+# $Id: lonroles.pm,v 1.71 2003/09/17 18:16:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -172,7 +172,7 @@
 			if (($ENV{'form.orgurl'}) && 
 			    ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$ENV{'form.orgurl'};
-			    if ( $Apache::lonnet::mod_perl_version() == 2 ) {
+			    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 				&Apache::lonnet::cleanenv();
 			    }
 			    $r->internal_redirect($dest);
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.143 loncom/homework/lonhomework.pm:1.144
--- loncom/homework/lonhomework.pm:1.143	Wed Sep 17 13:50:49 2003
+++ loncom/homework/lonhomework.pm	Wed Sep 17 14:16:39 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.143 2003/09/17 17:50:49 albertel Exp $
+# $Id: lonhomework.pm,v 1.144 2003/09/17 18:16:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,9 +69,6 @@
     } elsif ( defined($ENV{'form.grade_target'}  ) 
 	 && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});
-    } elsif (defined($ENV{'form.grade_target'}  ) 
-	 && ($ENV{'form.grade_target'} eq 'answer')) {
-      return ($ENV{'form.grade_target'});
     }
  
     if ( defined($ENV{'form.submitted'}) &&
@@ -660,7 +657,7 @@
     # 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::mod_perl_version() == 2 ) {
+	if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 	    &Apache::lonnet::cleanenv();
 	}
 	$request->internal_redirect('/adm/ambiguous'); return;
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.59 loncom/interface/lonfeedback.pm:1.60
--- loncom/interface/lonfeedback.pm:1.59	Wed Sep 17 13:50:49 2003
+++ loncom/interface/lonfeedback.pm	Wed Sep 17 14:16:39 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.59 2003/09/17 17:50:49 albertel Exp $
+# $Id: lonfeedback.pm,v 1.60 2003/09/17 18:16:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -737,7 +737,7 @@
    }
   } else {
 # Ambiguous Problem Resource
-      if ( $Apache::lonnet::mod_perl_version() == 2 ) {
+      if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 	  &Apache::lonnet::cleanenv();
       }
       $r->internal_redirect('/adm/ambiguous');
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.44 rat/lonpageflip.pm:1.45
--- rat/lonpageflip.pm:1.44	Wed Sep 17 13:50:49 2003
+++ rat/lonpageflip.pm	Wed Sep 17 14:16:39 2003
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.44 2003/09/17 17:50:49 albertel Exp $
+# $Id: lonpageflip.pm,v 1.45 2003/09/17 18:16:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,7 +388,7 @@
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-	  if ( $Apache::lonnet::mod_perl_version() == 2 ) {
+	  if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 	      &Apache::lonnet::cleanenv();
 	  }
 	  $r->internal_redirect('/adm/ambiguous');