projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ec03e9)
CRM-14567, fixed the bug with initialization of TCPDF
authorkurund <kurund@civicrm.org>
Mon, 30 Jun 2014 09:29:04 +0000 (14:59 +0530)
committerkurund <kurund@civicrm.org>
Mon, 30 Jun 2014 09:29:04 +0000 (14:59 +0530)
----------------------------------------
* CRM-14567: Replace DOMPDF with TCPDF for "Create PDF Letter"
  https://issues.civicrm.org/jira/browse/CRM-14567

CRM/Utils/PDF/Utils.php patch | blob | blame | history

diff --git a/CRM/Utils/PDF/Utils.php b/CRM/Utils/PDF/Utils.php
index 868526dfac9d3114550f22e70858addd3873f659..ff7f146e65c2a344bcdd4196bee5346da7bae2bc 100644 (file)
--- a/CRM/Utils/PDF/Utils.php
+++ b/CRM/Utils/PDF/Utils.php
@@ -67,16 +67,16 @@ class CRM_Utils_PDF_Utils {
     $orientation = CRM_Core_BAO_PdfFormat::getValue('orientation', $format);
     $metric      = CRM_Core_BAO_PdfFormat::getValue('metric', $format);
     $t           = CRM_Core_BAO_PdfFormat::getValue('margin_top', $format);
-    $r            = CRM_Core_BAO_PdfFormat::getValue('margin_right', $format);
+    $r           = CRM_Core_BAO_PdfFormat::getValue('margin_right', $format);
     $b           = CRM_Core_BAO_PdfFormat::getValue('margin_bottom', $format);
     $l           = CRM_Core_BAO_PdfFormat::getValue('margin_left', $format);
 
     $stationery_path_partial  = CRM_Core_BAO_PdfFormat::getValue('stationery', $format);
 
     $stationery_path = NULL;
-    if(strlen($stationery_path_partial)) {
-           $doc_root = $_SERVER['DOCUMENT_ROOT'];
-           $stationery_path = $doc_root."/".$stationery_path_partial;
+    if (strlen($stationery_path_partial)) {
+      $doc_root = $_SERVER['DOCUMENT_ROOT'];
+      $stationery_path = $doc_root . "/" . $stationery_path_partial;
     }
 
     $margins     = array($metric,$t,$r,$b,$l);
@@ -95,6 +95,7 @@ class CRM_Utils_PDF_Utils {
     // Strip <html>, <header>, and <body> tags from each page
     $htmlElementstoStrip = array(
       '@<head[^>]*?>.*?</head>@siu',
+      '@<script[^>]*?>.*?</script>@siu',
       '@<body>@siu',
       '@</body>@siu',
       '@<html[^>]*?>@siu',
@@ -132,8 +133,7 @@ class CRM_Utils_PDF_Utils {
 
     $paper_size_arr  = array( $paper_size[2], $paper_size[3]);
 
-    // print_r(  $paper_size_arr );
-    $pdf = new TCPDF($orientation, 'pt', $paper_size_arr, 'UTF-8', FALSE);
+    $pdf = new TCPDF($orientation, 'pt', $paper_size_arr);
     $pdf->Open();
 
     if (is_readable($stationery_path)){
@@ -155,7 +155,7 @@ class CRM_Utils_PDF_Utils {
     $reset_parm = false;
     $cell = false;
     $align = '' ;
-    //print $html;
+
     // output the HTML content
     $pdf->writeHTML($html, $ln, $fill, $reset_parm, $cell, $align);
 
@@ -167,7 +167,6 @@ class CRM_Utils_PDF_Utils {
     $pdf_file =  'CiviLetter'.'.pdf';
     $pdf->Output($pdf_file, 'D');
     CRM_Utils_System::civiExit(1);
-
   }
 
   /**