--- loncom/homework/essayresponse.pm	2004/12/21 22:46:27	1.57
+++ loncom/homework/essayresponse.pm	2005/03/31 21:24:29	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.57 2004/12/21 22:46:27 banghart Exp $
+# $Id: essayresponse.pm,v 1.60 2005/03/31 21:24:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,6 @@ sub start_essayresponse {
 	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"},'<>&"');
 	$result='<br /><table border="1">';
 	$result.='<tr><td>'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
@@ -64,32 +63,8 @@ sub start_essayresponse {
 	    $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
 	    $result .='</td></tr>';
 	}
-        if ($uploadedfiletypes) {
-	    $result.='<tr><td>'.&mt('Submit a file: (only one file can be uploaded)').
-		' <br /><input type="file" size="50" name="HWFILE'.
-		$part.'_'.$id.'" /><br />'.
-		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
-                '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
-                '<br />'.
-                '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
-		'<br />';
-	    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	        $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";
-	    }
-
-            if ($uploadedfile) {
-	       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);
-           } else {
-              $result.=&mt('(Hand in a file you have prepared on your computer)');
-           }
-           $result.='</td></tr>'; 
-        }
+	$result.=&Apache::inputtags::file_selector($part,$id,
+						   $uploadedfiletypes,'both');
         $result.='</table>';
     }
     return $result;
@@ -108,10 +83,9 @@ sub end_essayresponse {
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
 		if ($collaborators ne $previous_list);
 	}
-	if ( defined($ENV{'form.submitted'}) &&
-	     $ENV{'form.submitted'} eq 'scantron' ) {
+	if (  &Apache::response::submitted('scantron') ) {
 	    $increment=&Apache::response::scored_response($part,$id);
-	} elsif ( defined($ENV{'form.submitted'}) ) {
+	} elsif ( &Apache::response::submitted() ) {
 	    my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
@@ -144,11 +118,22 @@ sub end_essayresponse {
                     $portfiles =~s/,$//;
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
                     my @submitted_files = split /,/,$portfiles;
-		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
-		    &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
-                    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
-                    &Apache::lonnet::clear_selected_files($name);
-                    $uploadedflag=1;
+ 	            my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+                    $uploadedfiletypes=~s/[^\w\,]//g;
+                    $uploadedfiletypes=','.$uploadedfiletypes.',';
+                    foreach (@submitted_files) {
+                        my ($extension)=($_=~/\.(\w+)$/);
+	                unless ($uploadedfiletypes=~/\,$extension\,/i) {
+	                    $award='INVALID_FILETYPE';
+                        }
+                    }
+                    if ($award ne 'INVALID_FILETYPE'){
+        		my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+        		&Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
+                        &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
+                        &Apache::lonnet::clear_selected_files($name);
+                        $uploadedflag=1;
+                    }
     	        } else {
 		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
     	            &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);