--- loncom/interface/lonpdfupload.pm 2009/05/21 04:58:40 1.8 +++ loncom/interface/lonpdfupload.pm 2009/05/25 12:54:18 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Publication Handler +# PDF Form Upload Handler # -# $Id: lonpdfupload.pm,v 1.8 2009/05/21 04:58:40 onken Exp $ +# $Id: lonpdfupload.pm,v 1.12 2009/05/25 12:54:18 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,7 @@ sub handler() { $env{'request.uri'}=$r->uri; $r->content_type('text/html'); $r->send_http_header(); - $r->print(&Apache::loncommon::start_page(&mt('Upload PDF Form'))); + $r->print(&Apache::loncommon::start_page('Upload PDF Form')); #load post data into environment &Apache::lonacc::get_posted_cgi($r); @@ -217,13 +217,6 @@ sub grade_pdf { my $debug = (); $debug .= "Found: ". scalar @pdfdata." Entries \n"; - $result .= '
".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'}"; + return '
' + .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]' + ,$user.':'.$domain + ,$env{'user.domain'}.':'.$env{'user.name'}) + .'
'; } } elsif($entry =~ /^upload.*/) { @@ -254,7 +251,7 @@ sub grade_pdf { $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,6 +263,14 @@ sub grade_pdf { } #$result .= $debug; + $result .= '