[LON-CAPA-cvs] cvs: loncom /homework grades.pm /lonnet/perl lonnet.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 10 May 2004 23:18:28 -0000


albertel		Mon May 10 19:18:28 2004 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /loncom/homework	grades.pm 
  Log:
  - last of the tokenwrapper calls
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.498 loncom/lonnet/perl/lonnet.pm:1.499
--- loncom/lonnet/perl/lonnet.pm:1.498	Sat May  8 20:45:01 2004
+++ loncom/lonnet/perl/lonnet.pm	Mon May 10 19:18:27 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.498 2004/05/09 00:45:01 www Exp $
+# $Id: lonnet.pm,v 1.499 2004/05/10 23:18:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1180,10 +1180,6 @@
     my $httpurl=&hreflocation('',$url);
     $httpref{'httpref.'.$httpurl}=$srcurl;
     &Apache::lonnet::appenv(%httpref);
-}
-
-sub tokenwrapper {
-    &FIXME_blow_up;
 }
 
 # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.198 loncom/homework/grades.pm:1.199
--- loncom/homework/grades.pm:1.198	Fri May  7 13:40:51 2004
+++ loncom/homework/grades.pm	Mon May 10 19:18:27 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.198 2004/05/07 17:40:51 albertel Exp $
+# $Id: grades.pm,v 1.199 2004/05/10 23:18:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1669,7 +1669,9 @@
 			    $partid.'</b> <font color="#999999">( ID '.$respid.
 			    ' )</font>&nbsp; &nbsp;';
 			if ($record{"resource.$partid.$respid.uploadedurl"}) {
-			    $lastsubonly.='<a href="'.&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+			    &Apache::lonnet::allowuploaded('/adm/grades',
+			      $record{"resource.$partid.$respid.uploadedurl"});
+			    $lastsubonly.='<a href="'.$record{"resource.$partid.$respid.uploadedurl"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
 			}
 			$lastsubonly.='<b>Submitted Answer: </b>'.
 			    &cleanRecord($subval,$responsetype,$symb,$partid,