X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.pdf.inc;h=4f34ab7d2c99c1432f387c116119f2944b47b63f;hb=d33885e362355a59606b95a3ef8c73f68e7631c2;hp=9bc222d3eaa82ef13e0d5f65e58d0bdc9458af39;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/reporting/includes/class.pdf.inc b/reporting/includes/class.pdf.inc
index 9bc222d3..4f34ab7d 100644
--- a/reporting/includes/class.pdf.inc
+++ b/reporting/includes/class.pdf.inc
@@ -63,9 +63,9 @@ include_once (dirname(__FILE__).'/fpdi/fpdi.php');
 
 class Cpdf extends FPDI {
 
-	function Cpdf($pageSize='A4', $lang=null, $pageOrientation='P')
+	function __construct($pageSize='A4', $lang=null, $pageOrientation='P')
 	{
-		$this->TCPDF($pageOrientation, 'pt', $pageSize);//, $uni, $enc);
+		parent::__construct($pageOrientation, 'pt', $pageSize);//, $uni, $enc);
 		$this->SetLang($lang);
 		$this->setPrintHeader(false);
 		$this->setPrintFooter(false);
@@ -120,7 +120,6 @@ class Cpdf extends FPDI {
 		$this->FontFamily = 'helvetica';
 		$this->FontStyle = '';
 		$this->FontSizePt = 12;
-//		$this->utf8Bidi(array(""));
 	}
 
 
@@ -307,20 +306,30 @@ class Cpdf extends FPDI {
 				$align = 'J';
 		}
 		else
-			$align = 'R';
+		{
+			if ($align == 'right')
+				$align = 'R';// This may need to be 'L'
+			elseif ($align == 'left')
+				$align = 'R';
+			elseif ($align == 'center')
+				$align = 'C';
+			elseif ($align == 'justify')
+				$align = 'J';
+		}
 
+		$txt = parent::unhtmlentities($txt);
 		// If horizontal scaling was requested, check to see if we're trying to scale
 		// too much.  If so, cut back string first and then scale it.
 		$maxScaleFactor = 1.4;
 		if ($stretch == 1 || $stretch == 2)
-	        $txt = $this->calcTextWrap($txt, $w * $maxScaleFactor, $spacebreak);
+			$txt = $this->calcTextWrap($txt, $w * $maxScaleFactor, $spacebreak);
 		// Wrap text if stretching isn't turned on
 		else
-	        $txt = $this->calcTextWrap($txt, $w, $spacebreak);
+			$txt = $this->calcTextWrap($txt, $w, $spacebreak);
 		$ret = $txt[1];
 		$txt = $txt[0];
 		$this->SetXY($xb, $this->h - $yb - $h);
-		$txt = parent::unhtmlentities($txt);
+
 		if ($this->isunicode && $this->encoding != "UTF-8")
 			$txt = iconv($this->encoding, "UTF-8", $txt);
 		$this->Cell($w, $h, $txt, $border, 0, $align, $fill, $link, $stretch);
@@ -334,4 +343,3 @@ class Cpdf extends FPDI {
 
 } // end of class
 
-?>
\ No newline at end of file