diff --git a/include/class.pdf.php b/include/class.pdf.php index dae066b5b04ef22f151a65ce54cb71059d6691ac..34828aa2caf2c91fd9786deb5f946de71e4786af 100644 --- a/include/class.pdf.php +++ b/include/class.pdf.php @@ -77,7 +77,7 @@ class Ticket2PDF extends FPDF $this->SetY(-15); $this->Cell(0, 2, '', "T", 2, 'L'); $this->SetFont('Arial', 'I', 9); - $this->Cell(0, 7, 'Ticket printed by '.$thisstaff->getUsername().' on '.date('r'), 0, 0, 'L'); + $this->Cell(0, 7, 'Ticket printed by '.$thisstaff->getUserName().' on '.date('r'), 0, 0, 'L'); //$this->Cell(0,10,'Page '.($this->PageNo()-$this->pageOffset).' of {nb} '.$this->pageOffset.' '.$this->PageNo(),0,0,'R'); $this->Cell(0, 7, 'Page ' . ($this->PageNo() - $this->pageOffset), 0, 0, 'R'); } @@ -97,9 +97,9 @@ class Ticket2PDF extends FPDF $w =(($this->w/2)-$this->lMargin); $l = 40; $c = $w-$l; - $this->setDrawColor(220, 220, 220); - $this->setFillColor(244, 250, 255); - $this->setX($this->lMargin); + $this->SetDrawColor(220, 220, 220); + $this->SetFillColor(244, 250, 255); + $this->SetX($this->lMargin); $this->SetFont('Arial', 'B', 11); $this->Cell($l, 7, 'Status', 1, 0, 'L', true); $this->SetFont(''); @@ -189,7 +189,7 @@ class Ticket2PDF extends FPDF $color = $colors[$entry['thread_type']]; - $this->setFillColor($color[0], $color[1], $color[2]); + $this->SetFillColor($color[0], $color[1], $color[2]); $this->SetFont('Arial', 'B', 11); $this->Cell($w/2, 7, Format::db_datetime($entry['created']), 'LTB', 0, 'L', true); $this->SetFont('Arial', '', 10); diff --git a/include/class.ticket.php b/include/class.ticket.php index 59994470cafd6740bbbe8cc7c280949f63b607ed..84eafbd980a1dac5d5f72428f704801ed90a0267 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -541,7 +541,7 @@ class Ticket{ } function getClientThread() { - return $this->getThreadwithoutNotes(); + return $this->getThreadWithoutNotes(); } function getThreadWithNotes() { @@ -558,7 +558,7 @@ class Ticket{ if($includeNotes) //Include notes?? $treadtypes[] = 'N'; - return $this->getThreadbyType($treadtypes, $order); + return $this->getThreadByType($treadtypes, $order); } function getThreadByType($type, $order='ASC') { @@ -1555,7 +1555,7 @@ class Ticket{ function pdfExport() { $pdf = new Ticket2PDF($this, true); $name='Ticket-'.$this->getExtId().'.pdf'; - $pdf->output($name, 'I'); + $pdf->Output($name, 'I'); exit; } diff --git a/include/fpdf/fpdf.php b/include/fpdf/fpdf.php index a19cc97d08662738f88c93613849367c538f2430..f96a20ecb678428111ff8a342e0153c5914c4a5a 100644 --- a/include/fpdf/fpdf.php +++ b/include/fpdf/fpdf.php @@ -468,15 +468,15 @@ function AddFont($family, $style='', $file='') if(!isset($name)) $this->Error('Could not include font definition file'); $i=count($this->fonts)+1; - $this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file); - if($diff) + $this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file); # nolint + if($diff) # nolint { //Search existing encodings $d=0; $nb=count($this->diffs); for($i=1;$i<=$nb;$i++) { - if($this->diffs[$i]==$diff) + if($this->diffs[$i]==$diff) # nolint { $d=$i; break; @@ -485,16 +485,16 @@ function AddFont($family, $style='', $file='') if($d==0) { $d=$nb+1; - $this->diffs[$d]=$diff; + $this->diffs[$d]=$diff; # nolint } $this->fonts[$fontkey]['diff']=$d; } if($file) { if($type=='TrueType') - $this->FontFiles[$file]=array('length1'=>$originalsize); + $this->FontFiles[$file]=array('length1'=>$originalsize); # nolint else - $this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2); + $this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2); # nolint } }