[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm /lonnet/perl lonnet.pm

[www]

www		Thu Jun 27 10:08:06 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Putting the randomout task on &allowed
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.36 loncom/interface/lonnavmaps.pm:1.37
--- loncom/interface/lonnavmaps.pm:1.36	Mon Jun 24 10:28:10 2002
+++ loncom/interface/lonnavmaps.pm	Thu Jun 27 10:08:05 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.36 2002/06/24 14:28:10 www Exp $
+# $Id: lonnavmaps.pm,v 1.37 2002/06/27 14:08:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,8 +278,7 @@
     }
     my $brepriv=&Apache::lonnet::allowed('bre',$resource);
     if ($hash{'src_'.$rid}) {
-	if ((($brepriv eq '2') && (!$hash{'randomout_'.$rid})) 
-          || ($brepriv eq 'F')) {
+	if (($brepriv eq '2') || ($brepriv eq 'F')) {
 	    my $pprefix='';
 	    if ($resource=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 		$pprefix=&astatus($rid);
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.245 loncom/lonnet/perl/lonnet.pm:1.246
--- loncom/lonnet/perl/lonnet.pm:1.245	Wed Jun 26 15:46:19 2002
+++ loncom/lonnet/perl/lonnet.pm	Thu Jun 27 10:08:06 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.245 2002/06/26 19:46:19 www Exp $
+# $Id: lonnet.pm,v 1.246 2002/06/27 14:08:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1737,10 +1737,11 @@
        }
    }
 
-# Restricted by state?
+# Restricted by state or randomout?
 
    if ($thisallowed=~/X/) {
-      if (&condval($statecond)) {
+      if ((&condval($statecond)) && 
+          (!$ENV{'acc.randomout'}=~/\&$ENV{'request.symb'}\&/)) {
 	 return '2';
       } else {
          return '';