From baf364070e66e698bb8120b704edf945720b7a1e Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Sat, 5 Oct 2013 20:44:26 -0500
Subject: [PATCH] Better converting from ticket thread to PDF
Assume that text in the database is encoded in UTF-8 and assume that it is
HTML text and the entities should be decoded prior to display in the PDF.
Fixes #756
---
include/class.pdf.php | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/class.pdf.php b/include/class.pdf.php
index ba020c2bc..666431d8e 100644
--- a/include/class.pdf.php
+++ b/include/class.pdf.php
@@ -91,11 +91,21 @@ class Ticket2PDF extends FPDF
}
function _utf8($text) {
+ // Assume text is in utf-8 charset
+ $flags = ENT_COMPAT;
+ if (phpversion() >= '5.4.0')
+ $flags |= ENT_HTML401;
- if(function_exists('iconv'))
+ // Assume text in the database is HTML
+ $text = html_entity_decode($text, $flags, 'UTF-8');
+
+ if (function_exists('iconv'))
return iconv('UTF-8', 'windows-1252', $text);
+ elseif (function_exists('utf8_decode'))
+ return utf8_decode($text);
- return utf8_encode($text);
+ // XXX: FPDF does not support UTF-8 encoding
+ return $text;
}
function _print() {
--
GitLab