[freeside-commits] freeside/httemplate/view cust_bill-pdf.cgi, 1.11, 1.12 cust_bill-ps.cgi, 1.8, 1.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv16591

Modified Files:
	cust_bill-pdf.cgi cust_bill-ps.cgi 
Log Message:
adding Content-Disposition with a filename and proper extension fixes invoice opening on mac firefox, RT#14015

Index: cust_bill-ps.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_bill-ps.cgi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- cust_bill-ps.cgi	14 Jul 2011 17:13:06 -0000	1.8
+++ cust_bill-ps.cgi	15 Aug 2011 20:51:15 -0000	1.9
@@ -6,7 +6,7 @@
 
 my( $invnum, $template, $notice_name );
 my($query) = $cgi->keywords;
-if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) {
+if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
   $template = $2;
   $invnum = $3;
   $notice_name = 'Invoice';
@@ -36,7 +36,8 @@
 my $ps = $cust_bill->print_ps(\%opt);
 
 http_header('Content-Type' => 'application/postscript' );
-http_header('Content-Length' => length($pdf) );
+http_header('Content-Disposition' => "filename=$invnum.ps" );
+http_header('Content-Length' => length($ps) );
 http_header('Cache-control' => 'max-age=60' );
 
 </%init>

Index: cust_bill-pdf.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_bill-pdf.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- cust_bill-pdf.cgi	14 Jul 2011 17:13:06 -0000	1.11
+++ cust_bill-pdf.cgi	15 Aug 2011 20:51:15 -0000	1.12
@@ -6,13 +6,13 @@
 
 my( $invnum, $template, $notice_name );
 my($query) = $cgi->keywords;
-if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) {
+if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
   $template = $2;
   $invnum = $3;
   $notice_name = 'Invoice';
 } else {
   $invnum = $cgi->param('invnum');
-  $invnum =~ s/\.pdf//i;
+  $invnum =~ s/\.pdf//i; #probably not necessary anymore
   $template = $cgi->param('template');
   $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
 }
@@ -37,6 +37,7 @@
 my $pdf = $cust_bill->print_pdf(\%opt);
 
 http_header('Content-Type' => 'application/pdf' );
+http_header('Content-Disposition' => "filename=$invnum.pdf" );
 http_header('Content-Length' => length($pdf) );
 http_header('Cache-control' => 'max-age=60' );