diff --git a/src/Javanile/LightPDF/classes/TTFontFile.php b/src/Javanile/LightPDF/classes/TTFontFile.php index aad9740..987f496 100644 --- a/src/Javanile/LightPDF/classes/TTFontFile.php +++ b/src/Javanile/LightPDF/classes/TTFontFile.php @@ -1,7 +1,4 @@ mpdf = $mpdf; $this->tablecascadeCSS = array(); $this->listcascadeCSS = array(); diff --git a/src/Javanile/LightPDF/classes/form.php b/src/Javanile/LightPDF/classes/form.php index 59745b4..fca8e05 100644 --- a/src/Javanile/LightPDF/classes/form.php +++ b/src/Javanile/LightPDF/classes/form.php @@ -1,6 +1,5 @@ mpdf = $mpdf; // ACTIVE FORMS diff --git a/src/Javanile/LightPDF/classes/grad.php b/src/Javanile/LightPDF/classes/grad.php index 9348799..23cd700 100644 --- a/src/Javanile/LightPDF/classes/grad.php +++ b/src/Javanile/LightPDF/classes/grad.php @@ -6,7 +6,7 @@ class grad { var $mpdf = null; -function grad(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; } diff --git a/src/Javanile/LightPDF/classes/tocontents.php b/src/Javanile/LightPDF/classes/tocontents.php index f0ef9ab..53927b4 100644 --- a/src/Javanile/LightPDF/classes/tocontents.php +++ b/src/Javanile/LightPDF/classes/tocontents.php @@ -32,7 +32,7 @@ class tocontents { var $TOC_page_selector; var $m_TOC; -function tocontents(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; $this->_toc=array(); $this->TOCmark = 0; diff --git a/src/Javanile/LightPDF/mPDF.php b/src/Javanile/LightPDF/mPDF.php index 90ab0cf..3ca13d1 100644 --- a/src/Javanile/LightPDF/mPDF.php +++ b/src/Javanile/LightPDF/mPDF.php @@ -7651,6 +7651,8 @@ function Output($name='',$dest='') else { $dest='F'; } } + + /*-- PROGRESS-BAR --*/ if ($this->progressBar && ($dest=='D' || $dest=='I')) { if($name=='') { $name='mpdf.pdf'; } @@ -7704,7 +7706,7 @@ function Output($name='',$dest='') else { if ($this->progressBar) { $this->UpdateProgressBar(3,'','Finished'); } /*-- END PROGRESS-BAR --*/ - + switch($dest) { case 'I': if ($this->debug && !$this->allow_output_buffering && ob_get_contents()) { echo "

Output has already been sent from the script - PDF file generation aborted.

"; exit; } diff --git a/tests/test1.php b/tests/test1.php index 6c15dde..76b418a 100644 --- a/tests/test1.php +++ b/tests/test1.php @@ -23,4 +23,5 @@ $pdf->WriteHTML('

Hallo World

'); // -$pdf->Output('filename.pdf'); \ No newline at end of file +$pdf->Output(); + \ No newline at end of file