X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Fpdf_report.inc;h=115fa929d24ab9a34469ed9bffab0707fba42b7d;hb=59840905a38c4e08e5b13fdb7af71ea6dea7b1f0;hp=ffd0fe6bc371baf3a953787314e8abdf2299494e;hpb=ab7ef36ac4dc1d5187c86345de6706c7481b959f;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index ffd0fe6b..115fa929 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -1,8 +1,11 @@
titleCol = $this->leftMargin + 100;
$this->lineHeight = 12;
$this->fontSize = $fontsize;
+ $this->oldFontSize = 0;
+ $this->row = $this->pageHeight - $this->topMargin;
$this->currency = '';
- $this->rtl = ($_SESSION['language']->dir == 'rtl');
- // for quick testing
- //$this->rtl = true;
- $this->Cpdf($this->size);
+ $rtl = ($_SESSION['language']->dir === 'rtl' ? 'rtl' : 'ltr');
+ $code = $_SESSION['language']->code;
+ $enc = strtoupper($_SESSION['language']->encoding);
+ // for the language array in class.pdf.inc
+ $l = array('a_meta_charset' => $enc, 'a_meta_dir' => $rtl, 'a_meta_language' => $code, 'w_page' => 'page');
+ $this->Cpdf($size, $l);
}
function Font($style = 'normal')
{
- global $path_to_root;
- $own = false;
- $locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
- if (file_exists($locale))
- {
- $fontinclude = true;
- include($locale);
- }
- if (!$own)
- {
- if ($style == 'italic')
- $path = $path_to_root . 'reporting/fonts/Helvetica-Oblique.afm';
- elseif ($style == 'bold')
- $path = $path_to_root . 'reporting/fonts/Helvetica-Bold.afm';
- else // even take misspelled styles
- $path = $path_to_root . 'reporting/fonts/Helvetica.afm';
- }
- $this->selectFont($path, 'WinAnsiEncoding');
+ $this->selectFont("", $style);
}
function Info($params, $cols, $headers, $aligns,
@@ -236,7 +227,7 @@ class FrontReport extends Cpdf
$this->Font();
}
$str = _("Page") . ' ' . $this->pageNumber;
- $this->Text($this->endLine - 35, $str);
+ $this->Text($this->endLine - 38, $str);
$this->Line($this->row - 5, 1);
$this->row -= ($this->lineHeight + 6);
@@ -281,8 +272,6 @@ class FrontReport extends Cpdf
function AddImage($logo, $x, $y, $w, $h)
{
- if ($this->rtl)
- $x = $this->pageWidth - $x - $w;
if (strpos($logo, ".png") || strpos($logo, ".PNG"))
$this->addPngFromFile($logo, $x, $y, $w, $h);
else
@@ -291,12 +280,12 @@ class FrontReport extends Cpdf
function SetDrawColor($r, $g, $b)
{
- $this->setStrokeColor($r / 255, $g / 255, $b / 255);
+ $this->setStrokeColor($r, $g, $b);
}
function SetTextColor($r, $g, $b)
{
- $this->setColor($r / 255, $g / 255, $b / 255);
+ TCPDF::SetTextColor($r, $g, $b);
}
function Text($c, $txt, $n=0, $corr=0, $r=0)
@@ -309,14 +298,10 @@ class FrontReport extends Cpdf
function TextWrap($xpos, $ypos, $len, $str, $align = 'left')
{
- if ($this->rtl)
+ if ($this->fontSize != $this->oldFontSize)
{
- $str = strrev($str);
- $xpos = $this->pageWidth - $xpos - $len;
- if ($align == 'left')
- $align = 'right';
- elseif ($align == 'right')
- $align = 'left';
+ $this->SetFontSize($this->fontSize);
+ $this->oldFontSize = $this->fontSize;
}
return $this->addTextWrap($xpos, $ypos, $len, $this->fontSize, $str, $align);
}
@@ -331,7 +316,13 @@ class FrontReport extends Cpdf
return $this->TextWrap($this->cols2[$c], $this->row - $r, $this->cols2[$n] - $this->cols2[$c] + $corr, $txt, $this->aligns2[$c]);
}
- function TextColLines($c, $n, $txt, $corr=0)
+ function TextColLines($c, $n, $txt, $corr=0, $r=0)
+ {
+ $this->row -= $r;
+ $this->TextWrapLines($this->cols[$c], $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c]);
+ }
+
+ function TextWrapLines($c, $width, $txt, $align='left')
{
$str = Explode("\n", $txt);
for ($i = 0; $i < count($str); $i++)
@@ -339,7 +330,7 @@ class FrontReport extends Cpdf
$l = $str[$i];
do
{
- $l = $this->TextCol($c, $n, $l, $corr);
+ $l = $this->TextWrap($c, $this->row , $width, $l, $align);
$this->NewLine();
}
while ($l != '');
@@ -366,17 +357,11 @@ class FrontReport extends Cpdf
function End($email=0, $subject=null, $myrow=null, $doctype = 0)
{
- global $go_debug, $path_to_root, $comp_path;
-
- // this is no good in IE so has been replaced, see down under
- // but good for debugging purposes in IE
- //session_write_close();
+ global $pdf_debug, $path_to_root, $comp_path;
- if ($go_debug == 1)
+ if ($pdf_debug == 1)
{
- $buf = $this->output(1);
- $len = strlen($buf);
- $pdfcode = $buf;
+ $pdfcode = $this->Output('','S');
$pdfcode = str_replace("\n", "\n
", htmlspecialchars($pdfcode));
echo '