X-Git-Url: https://git.sesse.net/?p=webpdf;a=blobdiff_plain;f=createpdf.pl;h=3d9afce4281ebbb08d83435602f4b2e06651d694;hp=78ed00ecddc923625db0ac49e0e0d3d59b67e6b1;hb=130810b91098f85be3763e727bd420d2107b1f81;hpb=3b8b42d3275ec91a2030cc59d259dfddea0ec062

diff --git a/createpdf.pl b/createpdf.pl
index 78ed00e..3d9afce 100755
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -1,10 +1,30 @@
 #! /usr/bin/perl
+#
+# webpdf -- small set of scripts to make PDF files automatically from various
+#           formats, via a web interface.
+#
+# Copyright 2005 Steinar H. Gunderson <sgunderson@bigfoot.com>. 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# 
 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');
@@ -50,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);
@@ -84,9 +104,17 @@ 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");
+
+	# This is quite hideous -- it looks like OO.o calls the file something slightly
+	# different depending on the time format, phase of the moon or something... So
+	# we try both.
+	my $inp_ps = "output/$pdf_filename.$ext.pdf";
+	if (! -r $inp_ps) {
+		$inp_ps = "output/$pdf_filename.pdf";
+	}
 
-	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < output/$pdf_filename.pdf >&2");
+	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < $inp_ps >&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) {
 	$outname = "$1.pdf";
 	my $ext = $2;
@@ -102,7 +130,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 {
@@ -119,8 +147,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?