Diff for /loncom/homework/essayresponse.pm between versions 1.17 and 1.21

version 1.17, 2003/01/22 17:29:21 version 1.21, 2003/01/24 18:45:23
Line 31 Line 31
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 48  sub start_essayresponse { Line 49  sub start_essayresponse {
  my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");   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");   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='<br /><table border="1">';
  if ($ncol > 0) {   if ($ncol > 0) {
Line 62  sub start_essayresponse { Line 64  sub start_essayresponse {
         if ($uploadedfiletypes) {          if ($uploadedfiletypes) {
            $result.=             $result.=
 '<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.  '<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.
  $part.'_'.$id.'" value="'.$uploadedfile.'" onChange="this.form.enctype='.   $part.'_'.$id.'" onFocus="this.form.enctype='.
 "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />(Hand in a file you have prepared on your computer)</td></tr>';   "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
              if ($uploadedfile) {
          $result.='Currently submitted: <tt><a href="'.
                   &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'">'.$uploadedfile.'</a></tt>';
              } else {
                 $result.='(Hand in a file you have prepared on your computer)';
              }
              $result.='</td></tr>'; 
         }          }
  $result.='<tr><td>'.   $result.='<tr><td>'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.      '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
Line 87  sub end_essayresponse { Line 96  sub end_essayresponse {
     $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators      $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
  if ($collaborators ne $previous_list);   if ($collaborators ne $previous_list);
  }   }
           my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
           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);
      }
           }
  if ( defined $ENV{'form.submitted'}) {   if ( defined $ENV{'form.submitted'}) {
     my $response      = $ENV{'form.HWVAL'.$id};      my $response      = $ENV{'form.HWVAL'.$id};
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
Line 108  sub end_essayresponse { Line 129  sub end_essayresponse {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm';      $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm';
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter();
     $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm \end{enumerate}';      $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';
     &Apache::lonxml::increment_counter();      &Apache::lonxml::increment_counter();
  }   }
     }      }

Removed from v.1.17  
changed lines
  Added in v.1.21


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>