From a15ef5985f0699f06f58c4fd50ed7de5a556edf2 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Mon, 26 Feb 2018 09:50:04 +0000 Subject: - OutputBuffer Problem an den Stellen wo mit $pdf->output gearbeitet wird. git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6901 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_deliverynote/deliverynote_pdf.phtml | 2 ++ views/mods/mod_rechnungen/accounting_pdf.phtml | 6 +++++- views/mods/mod_rechnungen/invoice_pdf.phtml | 13 +++++++------ views/mods/mod_voucherproduct/voucher_pdf.phtml | 13 +++++++------ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml index 56091f7..8b913e6 100644 --- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml +++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml @@ -343,6 +343,8 @@ $offset += 10; } + + ob_end_clean(); if ($this->view['preview']) { diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml index a85bde2..8a3c612 100644 --- a/views/mods/mod_rechnungen/accounting_pdf.phtml +++ b/views/mods/mod_rechnungen/accounting_pdf.phtml @@ -921,10 +921,14 @@ $this->callMods('wpsg_mod_rechnungen_pdf', array(&$pdf, &$this->view['data']['id'], &$this->view['preview'], &$this->view['invoice'])); $filename = $this->view['filename'].".pdf"; - + + ob_end_clean(); + if ($this->view['preview']) { + $pdf->Output($filename, 'I'); + } else { diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 50e9e4e..11c682e 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -921,13 +921,14 @@ $this->callMods('wpsg_mod_rechnungen_pdf', array(&$pdf, &$this->view['data']['id'], &$this->view['preview'], &$this->view['invoice'])); $filename = $this->view['filename'].".pdf"; - - if ($this->view['preview']) - { + + ob_end_clean(); + + if ($this->view['preview']) { + $pdf->Output($filename, 'I'); - } - else - { + + } else { $pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'])).$filename, 'F'); diff --git a/views/mods/mod_voucherproduct/voucher_pdf.phtml b/views/mods/mod_voucherproduct/voucher_pdf.phtml index ae5a414..5727a70 100644 --- a/views/mods/mod_voucherproduct/voucher_pdf.phtml +++ b/views/mods/mod_voucherproduct/voucher_pdf.phtml @@ -86,18 +86,19 @@ } } + + ob_end_clean(); - if ($this->view['preview'] !== true) - { + if ($this->view['preview'] !== true) { $pdf->Output($this->view['filename'], 'F'); - } - else - { + } else { $pdf->Output($this->view['filename'], 'I'); - die(); + + exit; + } ?> \ No newline at end of file -- cgit v1.2.3