--- loncom/homework/essayresponse.pm	2005/01/31 22:00:40	1.58
+++ loncom/homework/essayresponse.pm	2005/05/03 05:31:51	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.58 2005/01/31 22:00:40 albertel Exp $
+# $Id: essayresponse.pm,v 1.65 2005/05/03 05:31:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::essayresponse;
 use strict;
 use Apache::lonxml();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
 
 BEGIN {
@@ -48,48 +48,28 @@ 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>'.
+            '<label>'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
-	    &mt('Submit entries below as answer to receive credit').' <br />'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
+	    &mt('Submit entries below as answer to receive credit').
+            '</label> <br />'.
+	    '<label>'.
+            '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
 	    &mt('Save entries below as a draft answer (not submitting them for credit yet)').
-	    ' </td></tr>';
+	    '</label>'.
+            ' </td></tr>';
 	if ($ncol > 0) {
-	    $result .='<tr><td>'.
+	    $result .='<tr><td>'.'<label>'.
 		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
 		$part.'_'.$id.'" value="'.$coll.'" /><br />'.
-		&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';
+		&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}).
+                '</label><br />';
 	    $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;
@@ -102,7 +82,7 @@ sub end_essayresponse {
     my $increment     = 1;
     my $result;
     if ( $target eq 'grade' ) {
-	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
+	my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};	
 	if ($collaborators =~ /[^\s]/) {
 	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
@@ -111,48 +91,17 @@ sub end_essayresponse {
 	if (  &Apache::response::submitted('scantron') ) {
 	    $increment=&Apache::response::scored_response($part,$id);
 	} 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};
+	    my $response      = $env{'form.HWVAL_'.$id};
+            my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+            my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
 	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
- 		my $award;
-        	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ 		my $award='DRAFT';
+        	if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
-		} else {
-		    $award='DRAFT';
 		}
                 my $uploadedflag=0;
-                if ($filename =~ /[^\s]/) {
- 	            my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-                    $uploadedfiletypes=~s/[^\w\,]//g;
-                    $uploadedfiletypes=','.$uploadedfiletypes.',';
-                    my ($extension)=($filename=~/\.(\w+)$/);
-	            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,undef,'essayresponse');
-                        $uploadedflag=1;
-		    } else {
-		        $award='INVALID_FILETYPE';
-                    }
-	        } else {
-	           $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
-                   $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
-	        }
-                if ($portfiles =~ /[^\s]/) {
-                    $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;
-    	        } else {
-		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
-    	            &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
-    	            $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
-    	        }
+		&file_submission($part,$id,'filename',\$award,\$uploadedflag);
+		&file_submission($part,$id,'portfiles',\$award,\$uploadedflag);
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
@@ -183,7 +132,7 @@ 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]';}
+	    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').
@@ -202,11 +151,58 @@ sub end_essayresponse {
     return $result;
 }
 
+sub file_submission {
+    my ($part,$id,$which,$award,$uploadedflag)=@_;
+    my $files;
+    if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; }
+    if ($which eq 'filename') {
+	$files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+    }
+    
+    if ($files =~ /[^\s]/) {
+	$files =~s/,$//;
+	$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
+	my @submitted_files = split(/,/,$files);
+	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+	if ($uploadedfiletypes) {
+	    $uploadedfiletypes=~s/[^\w\,]//g;
+	    $uploadedfiletypes=','.$uploadedfiletypes.',';
+	    foreach my $file (@submitted_files) {
+		my ($extension)=($file=~/\.(\w+)$/);
+		unless ($uploadedfiletypes=~/\,$extension\,/i) {
+		    $$award='INVALID_FILETYPE';
+		}
+	    }
+	}
+	if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
+	    $$uploadedflag=1;
+	}
+	if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
+	    my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	    &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+	    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);
+	    &Apache::lonnet::clear_selected_files($name);
+	}
+	if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
+	    $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
+		$files;
+	    $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
+		&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,
+						'essayresponse');
+	}
+    } elsif ($which eq 'portfiles' &&
+	     $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
+	my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+	$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
+    }
+}
+
 sub check_collaborators {
     my ($ncol,$coll) = @_;
     my %classlist=&Apache::lonnet::dump('classlist',
-					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+					$env{'course.'.$env{'request.course.id'}.'.domain'},
+					$env{'course.'.$env{'request.course.id'}.'.num'});
     my (@badcollaborators,$result);
     my (@collaborators) = split(/\,?\s+/,$coll);
     foreach (@collaborators) {
@@ -214,7 +210,7 @@ sub check_collaborators {
 	if (/@/) {
 	    $collaborator =~ s/@/:/;
 	} else {
-	    $collaborator = $_.':'.$ENV{'user.domain'};
+	    $collaborator = $_.':'.$env{'user.domain'};
 	}
 	push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
     }
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>