From 9b63600ab644665510218859d1a7ccdaf88f7354 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 12 Mar 2013 18:31:17 -0400 Subject: [PATCH] BUG 10958 La funcion PMF GenerateOutputDocuemnt no esta generando el output document SOLVED - When a html string is in other encoding type doesn't generate the pdf using TCPDF - Sanitize the html --- workflow/engine/classes/class.case.php | 7 +++++++ workflow/engine/classes/model/OutputDocument.php | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 9141bd6f1..b5de135b8 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -980,6 +980,13 @@ class Cases require_once 'classes/model/AdditionalTables.php'; $oReportTables = new ReportTables(); $addtionalTables = new additionalTables(); + + if (!isset($Fields['APP_NUMBER'])) { + $Fields['APP_NUMBER'] = $appFields['APP_NUMBER']; + } + if (!isset($Fields['APP_STATUS'])) { + $Fields['APP_STATUS'] = $appFields['APP_STATUS']; + } $oReportTables->updateTables($appFields['PRO_UID'], $sAppUid, $Fields['APP_NUMBER'], $aApplicationFields); $addtionalTables->updateReportTables( diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php index 5b7cbd51f..cc372f1ea 100755 --- a/workflow/engine/classes/model/OutputDocument.php +++ b/workflow/engine/classes/model/OutputDocument.php @@ -892,7 +892,12 @@ class OutputDocument extends BaseOutputDocument // Print text using writeHTMLCell() // $pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $html, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true); - $pdf->writeHTML($sContent, false, false, false, false, ''); + if (mb_detect_encoding($sContent) == 'UTF-8') { + $sContent = utf8_decode($sContent); + } + $doc = new DOMDocument('1.0', 'UTF-8'); + $doc->loadHtml($sContent); + $pdf->writeHTML($doc->saveXML(), false, false, false, false, ''); // --------------------------------------------------------- // Close and output PDF document