--- loncom/interface/lonpdfupload.pm	2009/06/17 13:00:38	1.13
+++ loncom/interface/lonpdfupload.pm	2010/03/18 14:50:15	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.13 2009/06/17 13:00:38 bisitz Exp $
+# $Id: lonpdfupload.pm,v 1.16 2010/03/18 14:50:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,58 +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'};
-
-    $env{'request.uri'}=$r->uri;
-    $r->content_type('text/html');
-    $r->send_http_header();
-
     # Breadcrumbs
-    my $brcrum = [{'href' => '/pdfupload',
+    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,})
     );
 
-    #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);
@@ -91,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"
     );
@@ -101,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.');
@@ -206,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'}) {