--- loncom/interface/lonpdfupload.pm	2010/03/18 19:11:05	1.18
+++ loncom/interface/lonpdfupload.pm	2015/06/09 21:22:57	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.18 2010/03/18 19:11:05 raeburn Exp $
+# $Id: lonpdfupload.pm,v 1.25 2015/06/09 21:22:57 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,6 +122,7 @@ sub handler() {
 sub get_javascripts() {
     
     my $message = &mt('Please choose a PDF-File.');
+    &js_escape(\$message);
 
     # simple test if the upload ends with ".pdf"
     # it's only for giving a message to the user
@@ -130,7 +131,7 @@ sub get_javascripts() {
 // <![CDATA[
     function checkFilename(form) {
         var fileExt = form.file.value;
-        fileExt = fileExt.match(/[.]pdf\$/g);
+        fileExt = fileExt.match(/[.]pdf\$/gi);
         if(fileExt) {
             return true;
         }
@@ -183,7 +184,7 @@ sub processPDF {
         &grade_pdf(@pdfdata);
     } else {
         $result .= '<p class="LC_error">'
-                  .&mt("Can't find any valid PDF formfields.")
+                  .&mt("Can't find any valid PDF form fields.")
                   .'</p>';
     }
 }
@@ -192,24 +193,24 @@ sub get_pdf_data() {
     my @data = ();
     my $pdf = CAM::PDF->new($env{'form.file'});
 
-    my @formFields = $pdf->getFormFieldList(); #get names of formfields
-    
-    foreach my $field (@formFields) {
-	my $dict = $pdf->getFormFieldDict($pdf->getFormField($field)); # get formfield dictonary
+    if($pdf) {
+        my @formFields = $pdf->getFormFieldList(); #get names of form fields
+
+        foreach my $field (@formFields) {
+            my $dict = $pdf->getFormFieldDict($pdf->getFormField($field)); # get form field dictonary
 
-        #
-        # this is necessary because CAM::PDF has a problem with formfieldnames which include a
-        # dot in fieldnames. So a fieldname like "i.am.aFormfield" will offer three fieldnames "i", "i.am" 
-        # and "i.am.aFormfield". The fragmentary names keep no values and will be ignored.
-        if($dict->{'V'}) {
-            push(@data, $field."?". $dict->{'V'}{'value'}); #binding fieldname with value
+            # this is necessary because CAM::PDF has a problem with form fieldnames which include a
+            # dot in fieldnames. So a fieldname like "i.am.aFormfield" will offer three fieldnames
+            # "i", "i.am" and "i.am.aFormfield". The fragmentary names keep no values and will be ignored.
+            if($dict->{'V'}) {
+                push(@data, $field."?". $dict->{'V'}{'value'}); #binding fieldname with value
+            }
         }
-    } 
+    }
     return @data;
 }
 
 sub grade_pdf {
-    my $result = ();
     my @pdfdata = @_;
     my ($result,$meta,%grades,%problems,%foreigncourse,$debug);
 
@@ -299,10 +300,12 @@ sub grade_pdf {
             $result .= '<td><a href="/res/'.$problem{'resource'}.
                        '?symb='.
                        &HTML::Entities::encode($problem{'symb'},'"&<>').
-                       '">'.$problemname.'</a></td><td class="';
+                       '">'.$problemname.'</a></td><td><span class="';
             if ($grade eq "EXACT_ANS" || $grade eq "APPROX_ANS") {
                 $result .= 'LC_answer_correct';
-            } else { 
+            } elsif ($grade eq "DRAFT") {
+                $result .= 'LC_answer_not_charged_try';
+            } else {
                 $result .= 'LC_answer_charged_try';
             }
             $result .= '">';
@@ -375,9 +378,10 @@ sub parse_grade_answer {
      my %answerhash = ('EXACT_ANS' => &mt('You are correct.'),
                        'APPROX_ANS' => &mt('You are correct.'),
                        'INCORRECT' => &mt('You are incorrect'),
+                       'DRAFT' => &mt('Copy saved but not submitted.'),
      );
 
-    foreach my $key (keys %answerhash) {
+    foreach my $key (keys(%answerhash)) {
         if($shortcut eq $key) {
             return $answerhash{$shortcut};
         }  
@@ -391,12 +395,12 @@ sub dumpenv  {
     my $r = shift;
 
     $r->print ("<br />-------------------<br />");
-    foreach my $key (sort (keys %env)) {
+    foreach my $key (sort(keys(%env))) {
         $r->print ("<br />$key -> $env{$key}");
     }
     $r->print ("<br />-------------------<br />");
     $r->print ("<br />-------------------<br />");
-    foreach my $key (sort (keys %ENV)) {
+    foreach my $key (sort(keys(%ENV))) {
         $r->print ("<br />$key -> $ENV{$key}");
     }
     $r->print ("<br />-------------------<br />");