Upgraded ImageMagick on cirkus, so no problems with PDF output from ImageMagick anymore.

[webpdf] / createpdf.pl

diff --git a/createpdf.pl b/createpdf.pl
index bd39e9c386e4958de35aa3f891de92a4e1efe34c..8bece1ce8182857e30952eb6a617c8186c5a3cc6 100755 (executable)
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -22,8 +22,9 @@ use CGI;
 use POSIX;
 use strict;
 use File::Temp;
+require './config.pm';
 
-$ENV{"HOME"} = "/home/cassarossa/itk/sesse/sesse-pdf/";
+$ENV{"HOME"} = $pdfweb::config::homedir;
 
 my $cgi = CGI->new;
 my $filename = $cgi->param('input');
@@ -69,7 +70,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
        $outname = "$1.pdf";
 
        # Run through ImageMagick first of all, then gs
-       open PIPE, "| convert $2:- ps:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
+       open PIPE, "| convert $2:- pdf:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
                 or die "convert: $!";
 
        my ($buf, $ret);
@@ -103,7 +104,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
        close DOC;
 
        # Create PostScript from OOo :-)
-       system("/usr/lib/openoffice/program/soffice -display :25 -headless -pt pdf /home/cassarossa/itk/sesse/public_html/pdf/output/$pdf_filename.$ext");
+       system("/usr/lib/openoffice/program/soffice -display $pdfweb::config::xserver -headless -pt pdf $pdfweb::config::outputdir/$pdf_filename.$ext");
 
        system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < output/$pdf_filename.pdf >&2");
 } elsif ($filename =~ /(.*)\.(c|cc|cpp|cs|h|py|rb|pl|diff|patch|js|php[1-5]?|hs|f|f90|java|css|sql|l|y|s?ml|sh|awk|m|v)$/i) {
@@ -121,7 +122,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
        (my $sanitized_filename = $filename) =~ tr/a-zA-Z0-9./_/c;
 
        # This is just perverse :-P 
-       system("vim -Z -R +\"set printheader=\%<$sanitized_filename\%h\%m\%=Page\\ \%N\" +\"ha >/home/cassarossa/itk/sesse/public_html/pdf/output/$pdf_filename.ps\" +:q output/$pdf_filename.$ext");
+       system("vim -Z -R +\"set printheader=\%<$sanitized_filename\%h\%m\%=Page\\ \%N\" +\"ha >$pdfweb::config::outputdir/$pdf_filename.ps\" +:q output/$pdf_filename.$ext");
 
        system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < output/$pdf_filename.ps >&2");
 } else {
@@ -138,8 +139,10 @@ EOF
 
 my $size = -s "output/$pdf_filename";
 
+(my $sanitized_outname = $outname) =~ tr/a-zA-Z0-9. -/_/c;
+
 print "Content-type: application/pdf\n";
-print "Content-disposition: attachment; filename=\"$outname\"\n";  # FIXME: XSS problems?
+print "Content-disposition: attachment; filename=\"$sanitized_outname\"\n";
 print "Content-length: $size\n\n";
 
 system("cat output/$pdf_filename");  # yuck?