--- loncom/interface/lonpdfupload.pm 2009/06/17 13:00:38 1.13 +++ loncom/interface/lonpdfupload.pm 2010/03/18 13:16:11 1.15 @@ -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.15 2010/03/18 13:16:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,45 +29,22 @@ 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 CAM::PDF; use strict; sub handler() { my $r = shift; - - # check user permissions - if(!&checkpermission($r)) { - # stop processing - return OK; - } - - $Apache::lonxml::request=$r; - $Apache::lonxml::debug=$env{'user.debug'}; - - $env{'request.uri'}=$r->uri; - $r->content_type('text/html'); - $r->send_http_header(); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + return OK if $r->header_only; # Breadcrumbs - my $brcrum = [{'href' => '/pdfupload', + my $brcrum = [{'href' => '/adm/pdfupload', 'text' => 'Upload PDF Form'}]; $r->print(&Apache::loncommon::start_page('Upload PDF Form', @@ -75,9 +52,6 @@ sub handler() { {'bread_crumbs' => $brcrum,}) ); - #load post data into environment - &Apache::lonacc::get_posted_cgi($r); - # if a file was upload if($env{'form.Uploaded'} && $env{'form.file'}) { $r->print(&processPDF); @@ -91,7 +65,7 @@ sub handler() { $r->print('
'."\n" .''."\n" - .&mt("Navigate Contents")."\n" + .&mt('Course Contents')."\n" .''."\n" .'
'."\n" ); @@ -101,33 +75,6 @@ sub handler() { return OK; } - -sub checkpermission() { - my $r = shift; - if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { - my $result = <