[Phpgroupware-cvs] property/inc/pdf class.ezpdf.php class.pdf.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/03/18 22:50:31

Modified files:
        inc/pdf        : class.ezpdf.php class.pdf.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/pdf/class.ezpdf.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/property/inc/pdf/class.pdf.php?cvsroot=phpgroupware&r1=1.6&r2=1.7

Patches:
Index: class.ezpdf.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/pdf/class.ezpdf.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.ezpdf.php     19 Feb 2007 13:30:07 -0000      1.5
+++ class.ezpdf.php     18 Mar 2007 22:50:31 -0000      1.6
@@ -655,7 +655,10 @@
   // note that the user will have had to make a font selection already or this 
will not
   // produce a valid pdf file.
 
+  if($GLOBALS['phpgw_info']['server']['charset']=='utf-8')
+  {
   $title = $this->utf2ascii($title);
+  }
    
   if (!is_array($data)){
     return;

Index: class.pdf.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/pdf/class.pdf.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.pdf.php       19 Feb 2007 13:30:07 -0000      1.6
+++ class.pdf.php       18 Mar 2007 22:50:31 -0000      1.7
@@ -2162,7 +2162,11 @@
 * add text to the document, at a specified location, size and angle on the page
 */
 function addText($x,$y,$size,$text,$angle=0,$wordSpaceAdjust=0){
+  
+  if($GLOBALS['phpgw_info']['server']['charset']=='utf-8')
+  {
   $text = $this->utf2ascii($text);
+  }
   
   if (!$this->numFonts){$this->selectFont(PHPGW_APP_INC . 
'/pdf/fonts/Helvetica');}