--- loncom/interface/lonpdfupload.pm	2009/05/21 05:57:50	1.9
+++ loncom/interface/lonpdfupload.pm	2010/03/18 16:08:48	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Publication Handler
+# PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.9 2009/05/21 05:57:50 raeburn Exp $
+# $Id: lonpdfupload.pm,v 1.17 2010/03/18 16:08:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,50 +29,73 @@ package Apache::lonpdfupload;
 
 use lib '/home/httpd/lib/perl';
 use Apache::Constants qw(:common :http);
-use LONCAPA;
-use LONCAPA::loncgi;
-use File::Path;
-use File::Basename;
-use File::Copy;
-use IO::File;
-use Image::Magick;
-use Apache::lonacc;
-use Apache::lonxml;
-use Apache::lonhtmlcommon();
 use Apache::lonnet;
+use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonlocal;
-use Apache::lonmsg();
-use Apache::lonhomework;
-use LONCAPA::Enrollment;
-use LONCAPA::Configuration;
+use File::MMagic;
 use CAM::PDF;
 
 use strict;
 
 sub handler() {
     my $r = shift;
-
-    # check user permissions 
-    if(!&checkpermission($r)) {
-        # stop processing 
-        return OK;
+    &Apache::loncommon::content_type($r,'text/html');
+    $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;
     }
 
-    $Apache::lonxml::request=$r;
-    $Apache::lonxml::debug=$env{'user.debug'};
+    # Breadcrumbs
+    my $brcrum = [{'href' => '/adm/pdfupload',
+                   'text' => 'Upload PDF Form'}];
+    if ($env{'form.Uploaded'} && $env{'form.file'}) {
+        push(@{$brcrum},{'href'  => '',
+                         'text'  => 'PDF upload result'});
+    }
 
-    $env{'request.uri'}=$r->uri;
-    $r->content_type('text/html');
-    $r->send_http_header();
-    $r->print(&Apache::loncommon::start_page('Upload PDF Form'));
+    $r->print(&Apache::loncommon::start_page('Upload PDF Form',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
 
-    #load post data into environment
-    &Apache::lonacc::get_posted_cgi($r);
+    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. 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,7 +106,7 @@ sub handler() {
     $r->print('<hr />'
              .'<p>'."\n"
              .'<a href="/adm/navmaps">'."\n"
-             .&mt("Navigate Contents")."\n"
+             .&mt('Course Contents')."\n"
              .'</a>'."\n"
              .'</p>'."\n"
     );
@@ -93,33 +116,6 @@ sub handler() {
     return OK;
 }
 
-
-sub checkpermission() {
-    my $r = shift;
-    if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
-        my $result  = <<END
-Content-type: text/html
-
-<html>
-  <head>
-    <title>
-      Bad Cookie
-    </title>
-  </head>
-  <body>
-    Your cookie information is incorrect.
-  </body>
-</html>
-END
-;
-        $r->print($result);
-        return 0;
-    } else {
-        return 1;
-    }
-}
-
-
 sub get_javascripts() {
     
     my $message = &mt('Please choose a PDF-File.');
@@ -164,7 +160,9 @@ sub get_uploadform() {
        .'<input type="file" name="file" id="filename" />'
        .&Apache::lonhtmlcommon::row_closure(1)
        .&Apache::lonhtmlcommon::end_pick_box()
+       .'<p>'
        .'<input type="submit" name="Uploaded" value="'.$lt{'submit'}.'" />'
+       .'</p>'
        .'</form>'
        .'<br />';
 
@@ -196,7 +194,7 @@ sub get_pdf_data() {
 	my $dict = $pdf->getFormFieldDict($pdf->getFormField($field)); # get formfield dictonary
 
         #
-        # this is nessesary 'cause CAM::PDF has a problem with formfieldnames which include a
+        # 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'}) {
@@ -209,21 +207,9 @@ sub get_pdf_data() {
 sub grade_pdf {
     my $result = ();
     my @pdfdata = @_;
+    my ($result,$meta,%grades,%problems,$debug);   
    
-    my $meta = ();
-    my %grades = ();
-    my %problems = ();
-        
-    my $debug = ();
-
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
-    $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 $entry (sort(@pdfdata)) {
         if ($entry =~ /^meta.*/) {
@@ -233,28 +219,33 @@ sub grade_pdf {
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
             
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {
-                return "<pre>".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'} </pre>";    
+                return '<p class="LC_error">'
+                      .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
+                          ,$user.':'.$domain
+                          ,$env{'user.domain'}.':'.$env{'user.name'})
+                      .'</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);
+            next unless (&Apache::lonnet::is_on_map($resource));
             $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,
-                                        'symb' => &Apache::lonenc::encrypted($symb),
+                                        'symb' => $symb,
                                         'submitted' => $part,
                                         $submit => 'Answer',
                                         $HWVAL => $value};
@@ -266,23 +257,37 @@ sub grade_pdf {
     }
     #$result .= $debug;
 
-    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";
+    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
+
+    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>$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();
         }
-        $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>';
     }
-    $result .= &Apache::loncommon::end_data_table();
-
 
     return $result;        
 }
@@ -310,7 +315,7 @@ sub grade_problem {
 sub parse_grade_answer {
     my ($shortcut) = @_;
      my %answerhash = ('EXACT_ANS' => &mt('You are correct.'),
-                       'APPROX_ANS' => &mt('You are approximated right'),
+                       'APPROX_ANS' => &mt('You are correct.'),
                        'INCORRECT' => &mt('You are incorrect'),
      );