--- loncom/interface/lonpdfupload.pm	2010/03/18 13:16:11	1.15
+++ loncom/interface/lonpdfupload.pm	2010/03/22 15:39:37	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.15 2010/03/18 13:16:11 raeburn Exp $
+# $Id: lonpdfupload.pm,v 1.20 2010/03/22 15:39:37 onken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,8 +32,11 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
+use Apache::lonnavmaps();
 use Apache::lonlocal;
+use File::MMagic;
 use CAM::PDF;
+use LONCAPA qw(:DEFAULT :match);
 
 use strict;
 
@@ -43,18 +46,59 @@ sub handler() {
     $r->send_http_header;
     return OK if $r->header_only;
 
+    #  Needs to be in a course
+    if (!$env{'request.course.fn'}) {
+        # Not in a course
+        $env{'user.error.msg'}="/adm/pdfupload:bre:0:0:Cannot upload PDF forms unless in a course";
+        return HTTP_NOT_ACCEPTABLE;
+    }
+
     # Breadcrumbs
     my $brcrum = [{'href' => '/adm/pdfupload',
                    'text' => 'Upload PDF Form'}];
+    if ($env{'form.Uploaded'} && $env{'form.file'}) {
+        push(@{$brcrum},{'href'  => '',
+                         'text'  => 'PDF upload result'});
+    }
 
     $r->print(&Apache::loncommon::start_page('Upload PDF Form',
                                              undef,
                                              {'bread_crumbs' => $brcrum,})
     );
 
+    if ($env{'request.course.id'}) {
+        my $permission = $env{'course.'.$env{'request.course.id'}.'.canuse_pdfforms'};
+        if ($permission eq '') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+            $permission = $domdefs{'canuse_pdfforms'};
+        }
+        unless ($permission) {
+            $r->print('<p class="LC_warning">'.
+                      &mt('Upload of PDF forms is not permitted for this course.').
+                      '</p>'.
+                      &Apache::loncommon::end_page());
+            return OK;
+        }
+    } else {
+        $r->print('<p class="LC_warning">'.
+                  &mt('Could not determine identity of this course.').' '.
+                  &mt('You may need to [_1]re-select[_2] the course.','<a href="/adm/roles">','</a>').
+                  '</p>'.
+                  &Apache::loncommon::end_page());
+        return OK;
+    }
+
     # if a file was upload
     if($env{'form.Uploaded'} && $env{'form.file'}) {
-        $r->print(&processPDF);
+        my $mm = new File::MMagic;
+        my $mime_type = $mm->checktype_contents($env{'form.file'});
+        if ($mime_type eq 'application/pdf') {
+            $r->print(&processPDF);
+        } else {
+            $r->print('<p class="LC_error">'
+                     .&mt("The uploaded file does not appear to be a PDF file.")
+                     .'</p>');
+        }
     } else { 
         # print upload form
         $r->print(&get_javascripts);
@@ -83,6 +127,7 @@ sub get_javascripts() {
     # it's only for giving a message to the user
     my $result .= <<END
   <script type="text/javascript">
+// <![CDATA[
     function checkFilename(form) {
         var fileExt = form.file.value;
         fileExt = fileExt.match(/[.]pdf\$/g);
@@ -92,6 +137,7 @@ sub get_javascripts() {
         alert("$message");
         return false;
     }
+// ]]>
   </script>
 END
 ;
@@ -109,8 +155,7 @@ sub get_uploadform() {
 
     my $result = 
         '<br />'
-       .'<form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);">'
-       .'<input type="hidden" name="type" value="upload" />'
+       .'<form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);" action="">'
        .&Apache::lonhtmlcommon::start_pick_box()
        .&Apache::lonhtmlcommon::row_headline()
        .'<h2>'.$lt{'title'}.'</h2>'
@@ -147,32 +192,42 @@ 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 formfields
+
+        foreach my $field (@formFields) {
+            my $dict = $pdf->getFormFieldDict($pdf->getFormField($field)); # get formfield 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 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
+            }
         }
-    } 
+    }
     return @data;
 }
 
 sub grade_pdf {
-    my $result = ();
     my @pdfdata = @_;
-   
-    my $meta = ();
-    my %grades = ();
-    my %problems = ();
-        
-    my $debug = ();
+    my ($result,$meta,%grades,%problems,%foreigncourse,$debug);
 
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        $result = '<h3>'.&mt('Verification of PDF form items failed').'</h3>'.
+                  '<div class="LC_error">'.
+                  &mt('Unable to retrieve information about course contents').' '.
+                  &mt('You may need to [_1]re-select[_2] the course.','<a href="/adm/roles">','</a>').
+                  '</div>';
+        return $result;
+    }
+    my %restitles;
+    foreach my $res ($navmap->retrieveResources()) {
+        my $symb = $res->symb; 
+        $restitles{$symb} = $res->compTitle();
+    }
+   
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
 
     foreach my $entry (sort(@pdfdata)) {
@@ -181,7 +236,6 @@ sub grade_pdf {
             my ($label, $value) = ($entry =~ /^([^?]*)\?(.*)/);
             my ($domain, $user) = split('&', $value);
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
-            
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {
                 return '<p class="LC_error">'
                       .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
@@ -190,21 +244,28 @@ sub grade_pdf {
                       .'</p>';
             }
 
-        } elsif($entry =~ /^upload.*/)  {
+        } elsif ($entry =~ /^upload.*/)  {
             $debug .= 'found: a problem -> '.$entry;
             my ($label, $value) = ($entry =~ /^([^?]*)\?(.*)/);
             my ($symb, $part, $type, $HWVAL) = split('&', $label);
-            my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);  
+            my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);
+            if ($map =~ m{^uploaded/($match_domain)/($match_courseid)/default(_?\d*)\.(page|sequence)}) {
+                my $mapcid = $1.'_'.$2;
+                if ($mapcid ne $env{'request.course.id'}) {
+                    push(@{$foreigncourse{$mapcid}},$symb);
+                }
+            }
+            next unless (exists($restitles{$symb}));
             $value =~ s/(.*)\n/$1/; 
 
             #filter incorrect radiobuttons (Bug in CABAReT Stage)
-            if($type eq 'radiobuttonresponse' && $value eq 'Off' ) {
+            if ($type eq 'radiobuttonresponse' && $value eq 'Off' ) {
                 next;
             }
  
             my $submit = $part;
             $submit =~ s/part_(.*)/submit_$1/;
-            if($problems{$symb.$part}) {
+            if ($problems{$symb.$part}) {
                  $problems{$symb.$part}{$HWVAL} = $value;
             } else {
                  $problems{$symb.$part} =  { 'resource' => $resource,
@@ -220,33 +281,73 @@ sub grade_pdf {
     }
     #$result .= $debug;
 
-    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
-    $result .= &Apache::loncommon::start_data_table()
-              .&Apache::loncommon::start_data_table_header_row()
-              .'<th>'.&mt('Problem Name').'</th>'
-              .'<th>'.&mt('Grading').'</th>'
-              .&Apache::loncommon::start_data_table_header_row()
-              .&Apache::loncommon::end_data_table_header_row();
-
-    foreach my $key (sort (keys %problems)) {
-        my %problem = %{$problems{$key}};
-        my ($problemname, $grade) = &grade_problem(%problem);
-
-        $result .= &Apache::loncommon::start_data_table_row();
-        $result .= "<td>$problemname</td><td class='";
-        if($grade eq "EXACT_ANS" || $grade eq "APPROX_ANS") {
-            $result .= "LC_answer_correct";
-        } else { 
-            $result .= "LC_answer_charged_try";
-        }
-        $grade = &parse_grade_answer($grade);
-        $result .= "'>$grade</span></td>";
-        $result .= &Apache::loncommon::end_data_table_row();
-    }
-    $result .= &Apache::loncommon::end_data_table();
+    $result .= '<h3>'.&mt('Result of PDF Form upload').'</h3>';
 
+    if (keys(%problems) > 0) {
+        $result .= &Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Problem Name').'</th>'
+                  .'<th>'.&mt('Grading').'</th>'
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .&Apache::loncommon::end_data_table_header_row();
+
+        foreach my $key (sort(keys(%problems))) {
+            my %problem = %{$problems{$key}};
+            my ($problemname, $grade) = &grade_problem(%problem);
+
+            $result .= &Apache::loncommon::start_data_table_row();
+            $result .= '<td><a href="/res/'.$problem{'resource'}.
+                       '?symb='.
+                       &HTML::Entities::encode($problem{'symb'},'"&<>').
+                       '">'.$problemname.'</a></td><td class="';
+            if ($grade eq "EXACT_ANS" || $grade eq "APPROX_ANS") {
+                $result .= 'LC_answer_correct';
+            } else { 
+                $result .= 'LC_answer_charged_try';
+            }
+            $result .= '">';
+            $grade = &parse_grade_answer($grade);
+            $result .= $grade.'</span></td>';
+            $result .= &Apache::loncommon::end_data_table_row();
+        }
+        $result .= &Apache::loncommon::end_data_table();
+    } else {
+        $result .= '<p class="LC_warning">'.
+                   &mt('As no gradable form items were found, no submissions have been recorded.').
+                   '</p>';
+    }
+    if (keys(%foreigncourse)) {
+        my ($numother,$othercrsmsg);
+        foreach my $cid (sort(keys(%foreigncourse))) {
+            my %coursehash = &Apache::lonnet::coursedescription($cid,
+                                                          {'one_time' => 1});
+            if (ref($foreigncourse{$cid}) eq 'ARRAY') {
+                if ($numother) {
+                    $othercrsmsg .= '</li><li>';
+                }
+                $othercrsmsg .= '<b>'.$coursehash{'description'}.'</b><ul>'."\n";
+                foreach my $symb (@{$foreigncourse{$cid}}) {
+                    my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);
+                    $othercrsmsg .= '<li>'.$resource.'</li>';
+                }
+                $othercrsmsg .= '</ul>';
+                $numother ++;
+            }
+        }
+        if ($numother) {
+            $result .= '<div class="LC_warning">';
+            if ($numother > 1) {
+                $result .= &mt('Your uploaded PDF form contained the following resource(s) from [_1] different courses:','<b>'.$numother.'</b>')."\n".'<ul><li>'.
+                           $othercrsmsg.'</li></ul>';
+            } else {
+                $result .= &mt('Your uploaded PDF form contained the following resource(s) from a different course:').' '.$othercrsmsg.
+                           &mt('Did you download the PDF form from another course and upload it to the wrong course?'); 
+            }
+            $result .= '</div>';
+        }
+    }
 
-    return $result;        
+    return $result;
 }
 
 sub grade_problem {