--- loncom/homework/essayresponse.pm	2008/12/22 14:55:28	1.96
+++ loncom/homework/essayresponse.pm	2009/09/11 16:34:09	1.100.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.96 2008/12/22 14:55:28 raeburn Exp $
+# $Id: essayresponse.pm,v 1.100.4.1 2009/09/11 16:34:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,17 +60,21 @@ sub start_essayresponse {
 	}
 	$result.='<br /><table border="1">';
 	if ( $Apache::lonhomework::type ne 'survey' ) {
-	    $result.= '<tr><td>'.
-		'<label>'.
-		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
-		&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)').
-		'</label>'.
-		'</td></tr>';
-	}
+            if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+                $result .= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />';
+            } else {
+                $result.= '<tr><td>'.
+                '<label>'.
+                '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
+                &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)').
+                '</label>'.
+                '</td></tr>';
+            }
+        }
 
 	if ($ncol > 0) {
 	    $result .='<tr><td>'.'<label>'.
@@ -267,7 +271,7 @@ sub file_submission {
         }
         my $uploadedfiletypes= 
             &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-        if ($uploadedfiletypes) {
+        if ($uploadedfiletypes ne '') {
             $uploadedfiletypes=~s/[^\w\,]//g;
             $uploadedfiletypes=','.$uploadedfiletypes.',';
             foreach my $file (@submitted_files) {
@@ -281,6 +285,8 @@ sub file_submission {
                     }
                 }
             }
+        } else {
+            @acceptable_files = @submitted_files;
         }
         my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
         if (!$maxfilesize) {
@@ -294,11 +300,14 @@ sub file_submission {
                 }
             } else {
                 my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser();
-                my ($path,$filename) = ($file =~ m{^(.+)/([^/]+)$});
+                my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$});
                 my $fullpath = '/userfiles/portfolio'.$path;
                 if (!exists($dirlist{$fullpath})) {
                     my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1);
-                    foreach my $dir_line (@list) {
+                    $dirlist{$fullpath} = \@list;
+                }
+                if (ref($dirlist{$fullpath}) eq 'ARRAY') {
+                    foreach my $dir_line (@{$dirlist{$fullpath}}) {
                         my ($fname,$dom,undef,$testdir,undef,undef,undef,undef,
                             $size,undef,$mtime,undef,undef,undef,$obs,undef) = 
                         split(/\&/,$dir_line,16);
@@ -310,7 +319,6 @@ sub file_submission {
                             last;
                         }
                     }
-                    $dirlist{$fullpath} = \@list;
                 }
             }
             if (ref($totalsize)) {
@@ -319,6 +327,7 @@ sub file_submission {
                     if ($which eq 'filename') {
                         &delete_form_items($jspart,$id);
                     }
+                    last;
                 } else {
                     push(@accepted_files,$file);
                 }
@@ -375,7 +384,7 @@ sub file_submission {
 	    $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
 		&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
 						$subdir);
-            &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id});
+            delete($env{'form.HWFILE'.$jspart.'_'.$id});
 	}
     } elsif ($which eq 'portfiles' &&
 	     $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
@@ -387,9 +396,9 @@ sub file_submission {
 
 sub delete_form_items {
     my ($jspart,$id) = @_;
-    &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'});
-    &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'});
-    &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id});
+    delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'});
+    delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'});
+    delete($env{'form.HWFILE'.$jspart.'_'.$id});
 }