--- loncom/homework/essayresponse.pm	2004/03/05 20:18:26	1.33
+++ loncom/homework/essayresponse.pm	2004/10/04 18:19:01	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.33 2004/03/05 20:18:26 albertel Exp $
+# $Id: essayresponse.pm,v 1.37 2004/10/04 18:19:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,10 +46,10 @@ sub start_essayresponse {
 	my $part= $Apache::inputtags::part;
 
 	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
-	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
         $uploadedfiletypes=~s/[^\w\,]//g;
-	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
+	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
 	$result='<br /><table border="1">';
 	$result.='<tr><td>'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
@@ -73,7 +73,10 @@ sub start_essayresponse {
 		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
 		'<br />';
            if ($uploadedfile) {
-	       my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).
+	       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+	       push (@Apache::lonxml::extlinks,$url);
+	       &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+	       my $curfile='<a href="'.$url.
 		   '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
 		   $uploadedfile.'</a>';
 	       $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
@@ -96,7 +99,7 @@ sub end_essayresponse {
     if ( $target eq 'grade' ) {
 	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
 	if ($collaborators =~ /[^\s]/) {
-	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
 		if ($collaborators ne $previous_list);
 	}
@@ -122,7 +125,7 @@ sub end_essayresponse {
 	           if ($uploadedfiletypes=~/\,$extension\,/i) {
 	              $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
                       $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
-                         &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
+                         &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
                       $uploadedflag=1;
 		   } else {
 		      $award='INVALID_FILETYPE';
@@ -158,12 +161,14 @@ sub end_essayresponse {
 	if ($Apache::lonhomework::type eq 'exam') {
 	    my $repetition=&Apache::response::repetition();
 	    $result.='\begin{enumerate}';
+	    if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
 	    for (my $i=0;$i<$repetition;$i++) {
 		$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
 		    '}.]\textit{'.&mt('Leave blank on scoring form').
 		    '}\vskip 0 mm';
 	    }
 	    $result.= '\end{enumerate}';
+	    $increment=$repetition;
 	}
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||