aepnat / simhelpdesk

statistic/pdftable/font/helveticai.php

Spacing +13 added lines, -13 removed lines

@@ -1,15 +1,15 @@
 <?php

-$fpdf_charwidths['helveticaI']=array(

-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,

-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,

-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,

-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,

-	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,

-	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,

-	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,

-	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,

-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,

-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,

-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,

-	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);

+$fpdf_charwidths['helveticaI'] = array(

+	chr(0)=>278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,

+	chr(22)=>278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,

+	','=>278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,

+	'B'=>667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>500, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,

+	'X'=>667, 'Y'=>667, 'Z'=>611, '['=>278, '\\'=>278, ']'=>278, '^'=>469, '_'=>556, '`'=>333, 'a'=>556, 'b'=>556, 'c'=>500, 'd'=>556, 'e'=>556, 'f'=>278, 'g'=>556, 'h'=>556, 'i'=>222, 'j'=>222, 'k'=>500, 'l'=>222, 'm'=>833,

+	'n'=>556, 'o'=>556, 'p'=>556, 'q'=>556, 'r'=>333, 's'=>500, 't'=>278, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>500, '{'=>334, '|'=>260, '}'=>334, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>222, chr(131)=>556,

+	chr(132)=>333, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>222, chr(146)=>222, chr(147)=>333, chr(148)=>333, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,

+	chr(154)=>500, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>260, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,

+	chr(176)=>400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,

+	chr(198)=>1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,

+	chr(220)=>722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,

+	chr(242)=>556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500);

 ?>

statistic/pdftable/font/vni_timesi.php

Spacing +22 added lines, -22 removed lines

@@ -1,24 +1,24 @@
 <?php

-$type='TrueType';

-$name='VNI-Times-Italic';

-$desc=array('Ascent'=>1058,'Descent'=>-218,'CapHeight'=>654,'Flags'=>32,'FontBBox'=>'[-468 -218 1150 1058]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>790);

-$up=-100;

-$ut=50;

-$cw=array(

-	chr(0)=>790,chr(1)=>790,chr(2)=>790,chr(3)=>790,chr(4)=>790,chr(5)=>790,chr(6)=>790,chr(7)=>790,chr(8)=>790,chr(9)=>790,chr(10)=>790,chr(11)=>790,chr(12)=>790,chr(13)=>790,chr(14)=>790,chr(15)=>790,chr(16)=>790,chr(17)=>790,chr(18)=>790,chr(19)=>790,chr(20)=>790,chr(21)=>790,

-	chr(22)=>790,chr(23)=>790,chr(24)=>790,chr(25)=>790,chr(26)=>790,chr(27)=>790,chr(28)=>790,chr(29)=>790,chr(30)=>790,chr(31)=>790,' '=>250,'!'=>338,'"'=>430,'#'=>502,'$'=>502,'%'=>838,'&'=>788,'\''=>216,'('=>338,')'=>338,'*'=>502,'+'=>686,

-	','=>256,'-'=>338,'.'=>256,'/'=>288,'0'=>502,'1'=>502,'2'=>502,'3'=>502,'4'=>502,'5'=>502,'6'=>502,'7'=>502,'8'=>502,'9'=>502,':'=>338,';'=>338,'<'=>686,'='=>686,'>'=>686,'?'=>502,'@'=>930,'A'=>596,

-	'B'=>614,'C'=>676,'D'=>726,'E'=>614,'F'=>614,'G'=>726,'H'=>726,'I'=>338,'J'=>450,'K'=>676,'L'=>564,'M'=>838,'N'=>676,'O'=>716,'P'=>614,'Q'=>726,'R'=>614,'S'=>502,'T'=>564,'U'=>726,'V'=>614,'W'=>838,

-	'X'=>614,'Y'=>614,'Z'=>564,'['=>400,'\\'=>288,']'=>400,'^'=>430,'_'=>502,'`'=>338,'a'=>502,'b'=>502,'c'=>450,'d'=>502,'e'=>448,'f'=>288,'g'=>502,'h'=>502,'i'=>288,'j'=>288,'k'=>450,'l'=>288,'m'=>726,

-	'n'=>502,'o'=>502,'p'=>502,'q'=>502,'r'=>400,'s'=>400,'t'=>288,'u'=>502,'v'=>450,'w'=>676,'x'=>450,'y'=>450,'z'=>400,'{'=>410,'|'=>288,'}'=>410,'~'=>552,chr(127)=>790,chr(128)=>790,chr(129)=>790,chr(130)=>889,chr(131)=>508,

-	chr(132)=>667,chr(133)=>676,chr(134)=>420,chr(135)=>420,chr(136)=>250,chr(137)=>1196,chr(138)=>40,chr(139)=>328,chr(140)=>40,chr(141)=>790,chr(142)=>790,chr(143)=>790,chr(144)=>790,chr(145)=>285,chr(146)=>330,chr(147)=>426,chr(148)=>537,chr(149)=>250,chr(150)=>564,chr(151)=>992,chr(152)=>40,chr(153)=>980,

-	chr(154)=>40,chr(155)=>328,chr(156)=>40,chr(157)=>790,chr(158)=>790,chr(159)=>614,chr(160)=>250,chr(161)=>389,chr(162)=>502,chr(163)=>502,chr(164)=>502,chr(165)=>502,chr(166)=>288,chr(167)=>500,chr(168)=>40,chr(169)=>768,chr(170)=>624,chr(171)=>502,chr(172)=>944,chr(173)=>338,chr(174)=>768,chr(175)=>338,

-	chr(176)=>882,chr(177)=>686,chr(178)=>308,chr(179)=>308,chr(180)=>40,chr(181)=>502,chr(182)=>558,chr(183)=>250,chr(184)=>40,chr(185)=>308,chr(186)=>664,chr(187)=>502,chr(188)=>758,chr(189)=>758,chr(190)=>758,chr(191)=>500,chr(192)=>40,chr(193)=>40,chr(194)=>40,chr(195)=>40,chr(196)=>40,chr(197)=>40,

-	chr(198)=>338,chr(199)=>676,chr(200)=>40,chr(201)=>40,chr(202)=>40,chr(203)=>40,chr(204)=>338,chr(205)=>338,chr(206)=>614,chr(207)=>40,chr(208)=>338,chr(209)=>726,chr(210)=>338,chr(211)=>338,chr(212)=>720,chr(213)=>40,chr(214)=>726,chr(215)=>686,chr(216)=>40,chr(217)=>40,chr(218)=>40,chr(219)=>40,

-	chr(220)=>40,chr(221)=>338,chr(222)=>722,chr(223)=>500,chr(224)=>40,chr(225)=>40,chr(226)=>40,chr(227)=>40,chr(228)=>40,chr(229)=>40,chr(230)=>288,chr(231)=>450,chr(232)=>40,chr(233)=>40,chr(234)=>40,chr(235)=>40,chr(236)=>288,chr(237)=>288,chr(238)=>450,chr(239)=>40,chr(240)=>288,chr(241)=>502,

-	chr(242)=>288,chr(243)=>288,chr(244)=>502,chr(245)=>40,chr(246)=>502,chr(247)=>686,chr(248)=>40,chr(249)=>40,chr(250)=>40,chr(251)=>40,chr(252)=>40,chr(253)=>288,chr(254)=>500,chr(255)=>450);

-$enc='cp1252';

-$diff='';

-$file='vni_timesi.z';

-$originalsize=53508;

+$type = 'TrueType';

+$name = 'VNI-Times-Italic';

+$desc = array('Ascent'=>1058, 'Descent'=>-218, 'CapHeight'=>654, 'Flags'=>32, 'FontBBox'=>'[-468 -218 1150 1058]', 'ItalicAngle'=>0, 'StemV'=>70, 'MissingWidth'=>790);

+$up = -100;

+$ut = 50;

+$cw = array(

+	chr(0)=>790, chr(1)=>790, chr(2)=>790, chr(3)=>790, chr(4)=>790, chr(5)=>790, chr(6)=>790, chr(7)=>790, chr(8)=>790, chr(9)=>790, chr(10)=>790, chr(11)=>790, chr(12)=>790, chr(13)=>790, chr(14)=>790, chr(15)=>790, chr(16)=>790, chr(17)=>790, chr(18)=>790, chr(19)=>790, chr(20)=>790, chr(21)=>790,

+	chr(22)=>790, chr(23)=>790, chr(24)=>790, chr(25)=>790, chr(26)=>790, chr(27)=>790, chr(28)=>790, chr(29)=>790, chr(30)=>790, chr(31)=>790, ' '=>250, '!'=>338, '"'=>430, '#'=>502, '$'=>502, '%'=>838, '&'=>788, '\''=>216, '('=>338, ')'=>338, '*'=>502, '+'=>686,

+	','=>256, '-'=>338, '.'=>256, '/'=>288, '0'=>502, '1'=>502, '2'=>502, '3'=>502, '4'=>502, '5'=>502, '6'=>502, '7'=>502, '8'=>502, '9'=>502, ':'=>338, ';'=>338, '<'=>686, '='=>686, '>'=>686, '?'=>502, '@'=>930, 'A'=>596,

+	'B'=>614, 'C'=>676, 'D'=>726, 'E'=>614, 'F'=>614, 'G'=>726, 'H'=>726, 'I'=>338, 'J'=>450, 'K'=>676, 'L'=>564, 'M'=>838, 'N'=>676, 'O'=>716, 'P'=>614, 'Q'=>726, 'R'=>614, 'S'=>502, 'T'=>564, 'U'=>726, 'V'=>614, 'W'=>838,

+	'X'=>614, 'Y'=>614, 'Z'=>564, '['=>400, '\\'=>288, ']'=>400, '^'=>430, '_'=>502, '`'=>338, 'a'=>502, 'b'=>502, 'c'=>450, 'd'=>502, 'e'=>448, 'f'=>288, 'g'=>502, 'h'=>502, 'i'=>288, 'j'=>288, 'k'=>450, 'l'=>288, 'm'=>726,

+	'n'=>502, 'o'=>502, 'p'=>502, 'q'=>502, 'r'=>400, 's'=>400, 't'=>288, 'u'=>502, 'v'=>450, 'w'=>676, 'x'=>450, 'y'=>450, 'z'=>400, '{'=>410, '|'=>288, '}'=>410, '~'=>552, chr(127)=>790, chr(128)=>790, chr(129)=>790, chr(130)=>889, chr(131)=>508,

+	chr(132)=>667, chr(133)=>676, chr(134)=>420, chr(135)=>420, chr(136)=>250, chr(137)=>1196, chr(138)=>40, chr(139)=>328, chr(140)=>40, chr(141)=>790, chr(142)=>790, chr(143)=>790, chr(144)=>790, chr(145)=>285, chr(146)=>330, chr(147)=>426, chr(148)=>537, chr(149)=>250, chr(150)=>564, chr(151)=>992, chr(152)=>40, chr(153)=>980,

+	chr(154)=>40, chr(155)=>328, chr(156)=>40, chr(157)=>790, chr(158)=>790, chr(159)=>614, chr(160)=>250, chr(161)=>389, chr(162)=>502, chr(163)=>502, chr(164)=>502, chr(165)=>502, chr(166)=>288, chr(167)=>500, chr(168)=>40, chr(169)=>768, chr(170)=>624, chr(171)=>502, chr(172)=>944, chr(173)=>338, chr(174)=>768, chr(175)=>338,

+	chr(176)=>882, chr(177)=>686, chr(178)=>308, chr(179)=>308, chr(180)=>40, chr(181)=>502, chr(182)=>558, chr(183)=>250, chr(184)=>40, chr(185)=>308, chr(186)=>664, chr(187)=>502, chr(188)=>758, chr(189)=>758, chr(190)=>758, chr(191)=>500, chr(192)=>40, chr(193)=>40, chr(194)=>40, chr(195)=>40, chr(196)=>40, chr(197)=>40,

+	chr(198)=>338, chr(199)=>676, chr(200)=>40, chr(201)=>40, chr(202)=>40, chr(203)=>40, chr(204)=>338, chr(205)=>338, chr(206)=>614, chr(207)=>40, chr(208)=>338, chr(209)=>726, chr(210)=>338, chr(211)=>338, chr(212)=>720, chr(213)=>40, chr(214)=>726, chr(215)=>686, chr(216)=>40, chr(217)=>40, chr(218)=>40, chr(219)=>40,

+	chr(220)=>40, chr(221)=>338, chr(222)=>722, chr(223)=>500, chr(224)=>40, chr(225)=>40, chr(226)=>40, chr(227)=>40, chr(228)=>40, chr(229)=>40, chr(230)=>288, chr(231)=>450, chr(232)=>40, chr(233)=>40, chr(234)=>40, chr(235)=>40, chr(236)=>288, chr(237)=>288, chr(238)=>450, chr(239)=>40, chr(240)=>288, chr(241)=>502,

+	chr(242)=>288, chr(243)=>288, chr(244)=>502, chr(245)=>40, chr(246)=>502, chr(247)=>686, chr(248)=>40, chr(249)=>40, chr(250)=>40, chr(251)=>40, chr(252)=>40, chr(253)=>288, chr(254)=>500, chr(255)=>450);

+$enc = 'cp1252';

+$diff = '';

+$file = 'vni_timesi.z';

+$originalsize = 53508;

 ?>

statistic/pdftable/lib/pdftable.inc.php

Indentation +4 added lines, -4 removed lines

@@ -397,10 +397,10 @@
 	$f = fopen($path,'r');

 	fseek($f,13,SEEK_SET);

 	$info = fread($f,3);

-    fclose($f);

-    $iUnit = ord($info{0});

-    $iX = ord($info{1}) * 256 + ord($info{2});

-    return array($iUnit, $iX);

+	fclose($f);

+	$iUnit = ord($info{0});

+	$iX = ord($info{1}) * 256 + ord($info{2});

+	return array($iUnit, $iX);

 }

 private function _html2text($text){

 	$text = str_replace(' ',' ',$text);

Spacing +336 added lines, -336 removed lines

@@ -10,18 +10,18 @@ 
 require_once('color.inc.php');

 require_once('htmlparser.inc.php');

 

-define('FHR',0.58);

-define('PDFTABLE_VERSION','1.95');

-$PDF_ALIGN  = array('left'=>'L','center'=>'C','right'=>'R','justify'=>'J');

-$PDF_VALIGN = array('top'=>'T','middle'=>'M','bottom'=>'B');

-class PDFTable extends FPDF{

-var $left;			//Toa do le trai cua trang

-var $right;			//Toa do le phai cua trang

-var $top;			//Toa do le tren cua trang

-var $bottom;		//Toa do le duoi cua trang

-var $width;			//Width of writable zone of page

-var $height;		//Height of writable zone of page

-var $defaultFontFamily ;

+define('FHR', 0.58);

+define('PDFTABLE_VERSION', '1.95');

+$PDF_ALIGN  = array('left'=>'L', 'center'=>'C', 'right'=>'R', 'justify'=>'J');

+$PDF_VALIGN = array('top'=>'T', 'middle'=>'M', 'bottom'=>'B');

+class PDFTable extends FPDF {

+var $left; //Toa do le trai cua trang

+var $right; //Toa do le phai cua trang

+var $top; //Toa do le tren cua trang

+var $bottom; //Toa do le duoi cua trang

+var $width; //Width of writable zone of page

+var $height; //Height of writable zone of page

+var $defaultFontFamily;

 var $defaultFontStyle;

 var $defaultFontSize;

 var $isNotYetSetFont;

@@ -31,62 +31,62 @@ 
 var $spacingLine = 0; //(mm)

 var $spacingParagraph = 0; //(mm)

 

-function PDFTable($orientation='P',$unit='mm',$format='A4'){

-	parent::FPDF($orientation,$unit,$format);

-	$this->SetMargins(20,20,20);

+function PDFTable($orientation = 'P', $unit = 'mm', $format = 'A4') {

+	parent::FPDF($orientation, $unit, $format);

+	$this->SetMargins(20, 20, 20);

 	$this->SetAuthor('Pham Minh Dung');

 	$this->_makePageSize();

 	$this->isNotYetSetFont = true;

 	$this->headerTable = $this->footerTable = '';

 }

 

-function SetPadding($s=1){

+function SetPadding($s = 1) {

 	$this->paddingCell = $s;

-	$this->paddingCell2 = 2*$s;

+	$this->paddingCell2 = 2 * $s;

 }

-function SetSpacing($linespacing=1,$paragraphspacing=2){

+function SetSpacing($linespacing = 1, $paragraphspacing = 2) {

 	$this->spacingLine = $linespacing;

 	$this->spacingParagraph = $paragraphspacing;

 }

-function SetMargins($left,$top,$right=null,$bottom=null){

+function SetMargins($left, $top, $right = null, $bottom = null) {

 	parent::SetMargins($left, $top, $right);

-	$this->bMargin = $bottom?$bottom:$top;

+	$this->bMargin = $bottom ? $bottom : $top;

 	$this->_makePageSize();

 }

 

-function SetLeftMargin($margin){

+function SetLeftMargin($margin) {

 	parent::SetLeftMargin($margin);

 	$this->_makePageSize();

 }

 

-function SetRightMargin($margin){

+function SetRightMargin($margin) {

 	parent::SetRightMargin($margin);

 	$this->_makePageSize();

 }

 

-function SetHeaderFooter($header='',$footer=''){

+function SetHeaderFooter($header = '', $footer = '') {

 	if ($header) $this->headerTable = $header;

 	if ($footer) $this->footerTable = $footer;

 }

-function Header(){

+function Header() {

 	$this->_makePageSize();

-	if ($this->headerTable){

+	if ($this->headerTable) {

 		$this->x = $this->left;

 		$this->y = 0;

-		$this->htmltable($this->headerTable,0);

+		$this->htmltable($this->headerTable, 0);

 	}

 }

-function Footer(){

-	if ($this->footerTable){

+function Footer() {

+	if ($this->footerTable) {

 		$this->x = $this->left;

 		$this->y = $this->bottom;

-		$this->htmltable($this->footerTable,0);

+		$this->htmltable($this->footerTable, 0);

 	}

 }

-private function _makePageSize(){

+private function _makePageSize() {

 	$this->left		= $this->lMargin;

 	$this->right	= $this->w - $this->rMargin;

-	$this->top		= $this->tMargin;

+	$this->top = $this->tMargin;

 	$this->bottom	= $this->h - $this->bMargin;

 	$this->width	= $this->right - $this->left;

 	$this->height	= $this->bottom - $this->tMargin;

@@ -96,158 +96,158 @@ 
  * @return int

  * Tra ve chieu cao cua 1 dong theo font hien hanh

  */

-function getLineHeight($fontSize = 0){

+function getLineHeight($fontSize = 0) {

 	if ($fontSize == 0) $fontSize = $this->FontSizePt;

-	return $fontSize*2/$this->k;

+	return $fontSize * 2 / $this->k;

 }

 

-private function _cellHeight(&$c){

-	$maxw = $c['w0']-$this->paddingCell;

+private function _cellHeight(&$c) {

+	$maxw = $c['w0'] - $this->paddingCell;

 	$h = 0;

 	$x = $this->paddingCell;

 	$countline = 0;

 	$maxline = 0;

 	$c['hline'] = array();

-	$c['wlinet'] = array(array(0,0));

+	$c['wlinet'] = array(array(0, 0));

 	$c['wlines'] = array(0);

 	$space = 0;

-	foreach ($c['font'] as &$f){

+	foreach ($c['font'] as &$f) {

 		$this->_setFontText($f);

 		$hl = $this->getLineHeight();

-		if ($maxline<$hl || $x==$this->paddingCell) $maxline=$hl;

+		if ($maxline < $hl || $x == $this->paddingCell) $maxline = $hl;

 		if (!isset($f['space'])) continue;

 		$space = $f['space'];

-		foreach ($f['line'] as $i=>&$l){

-			if ($x!=$this->paddingCell) $x+=$space;

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

+		foreach ($f['line'] as $i=>&$l) {

+			if ($x != $this->paddingCell) $x += $space;

+			if (isset($l['str']) && is_array($l['str']))

+			foreach ($l['str'] as &$t) {

 				if (!is_array($t)) continue;

-				if ($x==$this->paddingCell||$x+$t[1]<=$maxw){

+				if ($x == $this->paddingCell || $x + $t[1] <= $maxw) {

 					$c['wlinet'][$countline][0] += $t[1];

 					$c['wlinet'][$countline][1]++;

-					$x += $t[1]+(($x>$this->paddingCell)?$space:0);

-				}else{//auto break line

-					$h+=$maxline*FHR + $this->spacingLine;

-					$c['hline'][] = $maxline*FHR + $this->spacingLine;

-					$c['wlines'][$countline] = $x-$this->paddingCell;

+					$x += $t[1] + (($x > $this->paddingCell) ? $space : 0);

+				}else {//auto break line

+					$h += $maxline * FHR + $this->spacingLine;

+					$c['hline'][] = $maxline * FHR + $this->spacingLine;

+					$c['wlines'][$countline] = $x - $this->paddingCell;

 					$c['autobr'][$countline] = 1;

-					$maxline=$hl;$countline++;$x = $t[1]+$space;

-					$c['wlinet'][$countline] = array($t[1],1);

+					$maxline = $hl; $countline++; $x = $t[1] + $space;

+					$c['wlinet'][$countline] = array($t[1], 1);

 				}

 				$t[2] = $countline;

 			}

-			if ($l=='br'){

-				$h+=$maxline*FHR + max($this->spacingLine,$this->spacingParagraph);

-				$c['hline'][] = $maxline*FHR + $this->spacingLine;

-				$c['wlines'][$countline] = $x-$this->paddingCell;

-				$maxline=$hl;$countline++;$x = $this->paddingCell;

-				$c['wlinet'][$countline] = array(0,0);

+			if ($l == 'br') {

+				$h += $maxline * FHR + max($this->spacingLine, $this->spacingParagraph);

+				$c['hline'][] = $maxline * FHR + $this->spacingLine;

+				$c['wlines'][$countline] = $x - $this->paddingCell;

+				$maxline = $hl; $countline++; $x = $this->paddingCell;

+				$c['wlinet'][$countline] = array(0, 0);

 			}

 		}

 	}

-	$c['wlines'][$countline] = $x-$space-$this->paddingCell;

-	if ($maxline){

-		$h+=$maxline;

-		$c['hline'][] = $maxline*FHR;

+	$c['wlines'][$countline] = $x - $space - $this->paddingCell;

+	if ($maxline) {

+		$h += $maxline;

+		$c['hline'][] = $maxline * FHR;

 	}

 	$c['maxh'] = $h;

 	return $h;

 }

-private function _drawCellAligned($x0,$y0,&$c){

+private function _drawCellAligned($x0, $y0, &$c) {

 	$maxh = $c['h0'];

-	$maxw = $c['w0']-$this->paddingCell2;

+	$maxw = $c['w0'] - $this->paddingCell2;

 	$curh = $c['maxh'];

-	$x=$y=0; //Top by default

-	if ($c['va']=='M') $y = ($maxh-$curh)/2; //Middle

-	elseif ($c['va']=='B') $y = $maxh-$curh; //Bottom

+	$x = $y = 0; //Top by default

+	if ($c['va'] == 'M') $y = ($maxh - $curh) / 2; //Middle

+	elseif ($c['va'] == 'B') $y = $maxh - $curh; //Bottom

 	$curline = 0;

 	$morespace = 0;

 	$cl = $c['hline'][$curline];

-	$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

-	foreach ($c['font'] as &$f){

+	$this->_cellHorzAlignLine($c, $curline, $maxw, $x, $morespace);

+	foreach ($c['font'] as &$f) {

 		$this->_setFontText($f);

-		if (isset($f['color'])){

+		if (isset($f['color'])) {

 			$color = Color::HEX2RGB($f['color']);

-			$this->SetTextColor($color[0],$color[1],$color[2]);

+			$this->SetTextColor($color[0], $color[1], $color[2]);

 		}else unset($color);

 		$hl = $this->getLineHeight();

 		if (!isset($f['space'])) continue;

 		$space = $f['space'];

-		foreach ($f['line'] as $i=>&$l){

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

-				if ($t[2]!=$curline){

-					$y += $cl;$curline++;$cl = $c['hline'][$curline];

-					$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

+		foreach ($f['line'] as $i=>&$l) {

+			if (isset($l['str']) && is_array($l['str']))

+			foreach ($l['str'] as &$t) {

+				if ($t[2] != $curline) {

+					$y += $cl; $curline++; $cl = $c['hline'][$curline];

+					$this->_cellHorzAlignLine($c, $curline, $maxw, $x, $morespace);

 				}

-				$this->x = $x+$x0;

-				$this->y = $y+$y0+$cl;

-				$this->Cell($t[1],0,$t[0]);

-				$x += $t[1]+$space+$morespace;

+				$this->x = $x + $x0;

+				$this->y = $y + $y0 + $cl;

+				$this->Cell($t[1], 0, $t[0]);

+				$x += $t[1] + $space + $morespace;

 			}

-			if ($l=='br'){

-				$y += $cl;$curline++;$cl = $c['hline'][$curline];

-				$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

+			if ($l == 'br') {

+				$y += $cl; $curline++; $cl = $c['hline'][$curline];

+				$this->_cellHorzAlignLine($c, $curline, $maxw, $x, $morespace);

 			}

 		}

 		if (isset($color))

 			$this->SetTextColor(0);

 	}

 }

-private function _cellHorzAlignLine(&$c,$line,$maxw,&$x,&$morespace){

+private function _cellHorzAlignLine(&$c, $line, $maxw, &$x, &$morespace) {

 	$morespace = 0;

-	$x = $this->paddingCell;//Left by default

-	if (!isset($c['wlines'][$line])) return ;

-	if ($c['a']=='C'){//Center

-		$x = ($maxw-$c['wlines'][$line])/2;

-	}elseif ($c['a']=='R'){

-		$x = $maxw-$c['wlines'][$line];

-	}elseif ($c['a']=='J' && $c['wlinet'][$line][1]>1

-		&& isset($c['autobr'][$line])){//Justify

-		$morespace = ($maxw-$c['wlines'][$line])/($c['wlinet'][$line][1]-1);

+	$x = $this->paddingCell; //Left by default

+	if (!isset($c['wlines'][$line])) return;

+	if ($c['a'] == 'C') {//Center

+		$x = ($maxw - $c['wlines'][$line]) / 2;

+	}elseif ($c['a'] == 'R') {

+		$x = $maxw - $c['wlines'][$line];

+	}elseif ($c['a'] == 'J' && $c['wlinet'][$line][1] > 1

+		&& isset($c['autobr'][$line])) {//Justify

+		$morespace = ($maxw - $c['wlines'][$line]) / ($c['wlinet'][$line][1] - 1);

 	}

 	if ($x < $this->paddingCell) $x = $this->paddingCell;

 }

 

-private function _calWidth($w){

-	$p = strpos($w,'%');

-	if ($p!==false){

-		return intval(substr($w,0,$p)*$this->width/100);

+private function _calWidth($w) {

+	$p = strpos($w, '%');

+	if ($p !== false) {

+		return intval(substr($w, 0, $p) * $this->width / 100);

 	}else return intval($w);

 }

 /**

  * @return array

  * @desc Parse a string in html and return array of attribute of table

  */

-private function _tableParser(&$html){

+private function _tableParser(&$html) {

 	$t = new TreeHTML(new HTMLParser($html), 0);

-	$row	= $col	= -1;

+	$row = $col = -1;

 	$table['nc'] = $table['nr'] = 0;

 	$table['repeat'] = array();

 	$cell   = array();

 	$fontopen = false;

 	$tdopen = false;

-	foreach ($t->name as $i=>$element){

-		if ($fontopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

-			&& (in_array($element,array('table','tr','td','font'))))

+	foreach ($t->name as $i=>$element) {

+		if ($fontopen && $t->type[$i] == NODE_TYPE_ENDELEMENT

+			&& (in_array($element, array('table', 'tr', 'td', 'font'))))

 				$fontopen = false;

-		if ($tdopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

-			&& (in_array($element,array('table','tr','td')))

-			&& !isset($cell[$row][$col]['miw'])){

+		if ($tdopen && $t->type[$i] == NODE_TYPE_ENDELEMENT

+			&& (in_array($element, array('table', 'tr', 'td')))

+			&& !isset($cell[$row][$col]['miw'])) {

 				$c = &$cell[$row][$col];

 				$c['miw'] = $c['maw'] = 0;

 				$tdopen = false;

 		}

 		if ($t->type[$i] != NODE_TYPE_ELEMENT && $t->type[$i] != NODE_TYPE_TEXT) continue;

-		switch ($element){

+		switch ($element) {

 			case 'table':

 				$tdopen = 0;

-				$a	= &$t->attribute[$i];

+				$a = &$t->attribute[$i];

 				if (isset($a['width']))		$table['w']	= $this->_calWidth($a['width']);

 				if (isset($a['height']))	$table['h']	= intval($a['height']);

 				if (isset($a['align']))		$table['a']	= $this->getAlign(strtolower($a['align']));

-				$table['border'] = (isset($a['border']))?	$a['border']: 0;

-				if (isset($a['bgcolor']))	$table['bgcolor'][-1]	= $a['bgcolor'];

+				$table['border'] = (isset($a['border'])) ? $a['border'] : 0;

+				if (isset($a['bgcolor']))	$table['bgcolor'][-1] = $a['bgcolor'];

 				$table['nobreak'] = isset($a['nobreak']);

 				break;

 			case 'tr':

@@ -255,156 +255,156 @@ 
 				$row++;

 				$table['nr']++;

 				$col = -1;

-				$a	= &$t->attribute[$i];

-				if (isset($a['bgcolor']))	$table['bgcolor'][$row]	= $a['bgcolor'];

-				if (isset($a['repeat']))	$table['repeat'][]		= $row;

-				else{

-					if (isset($a['pbr']))	$table['pbr'][$row]	= 1;

-					if (isset($a['knext']))	$table['knext'][$row]	= 1;

+				$a = &$t->attribute[$i];

+				if (isset($a['bgcolor']))	$table['bgcolor'][$row] = $a['bgcolor'];

+				if (isset($a['repeat']))	$table['repeat'][] = $row;

+				else {

+					if (isset($a['pbr']))	$table['pbr'][$row] = 1;

+					if (isset($a['knext']))	$table['knext'][$row] = 1;

 				}

 				break;

 			case 'td':

 				$tdopen = 1;

-				$col++;while (isset($cell[$row][$col])) $col++;

+				$col++; while (isset($cell[$row][$col])) $col++;

 				//Update number column

-				if ($table['nc'] < $col+1)		$table['nc']		= $col+1;

+				if ($table['nc'] < $col + 1)		$table['nc'] = $col + 1;

 				$cell[$row][$col] = array();

 				$c = &$cell[$row][$col];

 				$a	= &$t->attribute[$i];

 				if (isset($a['width']))		$c['w']		= intval($a['width']);

 				if (isset($a['height']))	$c['h']		= intval($a['height']);

-				$c['a'] = isset($a['align'])?$this->getAlign($a['align']):'L';

-				$c['va']= isset($a['valign'])?$this->getVAlign($a['valign']):'T';

-				if (isset($a['border']))	$c['border']	= $a['border'];

-					else					$c['border']	= $table['border'];

-				if (isset($a['bgcolor']))	$c['bgcolor']	= $a['bgcolor'];

+				$c['a'] = isset($a['align']) ? $this->getAlign($a['align']) : 'L';

+				$c['va'] = isset($a['valign']) ? $this->getVAlign($a['valign']) : 'T';

+				if (isset($a['border']))	$c['border'] = $a['border'];

+					else					$c['border'] = $table['border'];

+				if (isset($a['bgcolor']))	$c['bgcolor'] = $a['bgcolor'];

 				$cs = $rs = 1;

-				if (isset($a['colspan']) && $a['colspan']>1)	$cs = $c['colspan']	= intval($a['colspan']);

-				if (isset($a['rowspan']) && $a['rowspan']>1)	$rs = $c['rowspan']	= intval($a['rowspan']);

+				if (isset($a['colspan']) && $a['colspan'] > 1)	$cs = $c['colspan']	= intval($a['colspan']);

+				if (isset($a['rowspan']) && $a['rowspan'] > 1)	$rs = $c['rowspan']	= intval($a['rowspan']);

 				if (isset($a['size']))		$c['font'][0]['size']   	= $a['size'];

-				if (isset($a['family']))	$c['font'][0]['family'] 	= $a['family'];

-				if (isset($a['style'])){

+				if (isset($a['family']))	$c['font'][0]['family'] = $a['family'];

+				if (isset($a['style'])) {

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach ($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

 					$c['font'][0]['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$c['font'][0]['color'] 		= $a['color'];

+				if (isset($a['color']))		$c['font'][0]['color'] = $a['color'];

 				//Chiem dung vi tri de danh cho cell span

-				for ($k=$row;$k<$row+$rs;$k++) for($l=$col;$l<$col+$cs;$l++){

-					if ($k-$row || $l-$col)

+				for ($k = $row; $k < $row + $rs; $k++) for ($l = $col; $l < $col + $cs; $l++) {

+					if ($k - $row || $l - $col)

 						$cell[$k][$l] = 0;

 				}

-				if (isset($a['nowrap']))	$c['nowrap']= 1;

+				if (isset($a['nowrap']))	$c['nowrap'] = 1;

 				$fontopen = true;

 				if (!isset($c['font'])) $c['font'][] = array();

 				break;

 			case 'Text':

 				$c = &$cell[$row][$col];

 				if (!$fontopen || !isset($c['font'])) $c['font'][] = array();

-				$f = &$c['font'][count($c['font'])-1];

-				$this->_setTextAndSize($c,$f,$this->_html2text($t->value[$i]));

+				$f = &$c['font'][count($c['font']) - 1];

+				$this->_setTextAndSize($c, $f, $this->_html2text($t->value[$i]));

 				break;

 			case 'font':

 				$a	= &$t->attribute[$i];

 				$c = &$cell[$row][$col];

 				$c['font'][] = array();

-				$f = &$c['font'][count($c['font'])-1];

-				if (isset($a['size']))		$f['size']   	= $a['size'];

-				if (isset($a['family']))	$f['family'] 	= $a['family'];

-				if (isset($a['style'])){

+				$f = &$c['font'][count($c['font']) - 1];

+				if (isset($a['size']))		$f['size'] = $a['size'];

+				if (isset($a['family']))	$f['family'] = $a['family'];

+				if (isset($a['style'])) {

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach ($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

 					$f['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$f['color'] 		= $a['color'];

+				if (isset($a['color']))		$f['color'] = $a['color'];

 				break;

 			case 'img':

-				$a	= &$t->attribute[$i];

-				if (isset($a['src'])){

-					$this->_setImage($c,$a);

+				$a = &$t->attribute[$i];

+				if (isset($a['src'])) {

+					$this->_setImage($c, $a);

 				}

 				break;

 			case 'br':

 				$c = &$cell[$row][$col];

-				$cn = isset($c['font'])?count($c['font'])-1:0;

+				$cn = isset($c['font']) ?count($c['font']) - 1 : 0;

 				$c['font'][$cn]['line'][] = 'br';

 				break;

 		}

 	}

 	$table['cells'] = $cell;

-	$table['wc']	= array_pad(array(),$table['nc'],array('miw'=>0,'maw'=>0));

-	$table['hr']	= array_pad(array(),$table['nr'],0);

+	$table['wc']	= array_pad(array(), $table['nc'], array('miw'=>0, 'maw'=>0));

+	$table['hr']	= array_pad(array(), $table['nr'], 0);

 	return $table;

 }

 

-private function _setTextAndSize(&$cell,&$f, $text){

-	if ($text=='') return;

+private function _setTextAndSize(&$cell, &$f, $text) {

+	if ($text == '') return;

 	$this->_setFontText($f);

-	if (!isset($f['line'][0])){

+	if (!isset($f['line'][0])) {

 		$f['line'][0]['min'] = $f['line'][0]['max'] = 0;

 	}

-	$text = preg_split('/[\s]+/',$text,-1, PREG_SPLIT_NO_EMPTY);

-	$l = &$f['line'][count($f['line'])-1];

-	if ($l=='br'){

-		$f['line'][] = array('min'=>0,'max'=>0,'str'=>array());

-		$l = &$f['line'][count($f['line'])-1];

+	$text = preg_split('/[\s]+/', $text, -1, PREG_SPLIT_NO_EMPTY);

+	$l = &$f['line'][count($f['line']) - 1];

+	if ($l == 'br') {

+		$f['line'][] = array('min'=>0, 'max'=>0, 'str'=>array());

+		$l = &$f['line'][count($f['line']) - 1];

 	}

 	if (!isset($f['space'])) $f['space'] = $this->GetStringWidth(' ');

 	$ct = count($text);

-	foreach ($text as $item){

+	foreach ($text as $item) {

 		$s = $this->GetStringWidth($item);

-		if ($l['min']<$s) $l['min']=$s;

+		if ($l['min'] < $s) $l['min'] = $s;

 		$l['max'] += $s;

-		if ($ct>1) $l['max'] += $f['space'];

-		$l['str'][] =  array($item,$s);

+		if ($ct > 1) $l['max'] += $f['space'];

+		$l['str'][] = array($item, $s);

 	}

 	if (isset($cell['nowrap'])) $l['min'] = $l['max'];

-	if (!isset($cell['miw']) || $cell['miw']-$this->paddingCell2<$l['min'])

-		$cell['miw']=$l['min']+$this->paddingCell2;

-	if (!isset($cell['maw']) || $cell['maw']-$this->paddingCell2<$l['max'])

-		$cell['maw']=$l['max']+$this->paddingCell2;

+	if (!isset($cell['miw']) || $cell['miw'] - $this->paddingCell2 < $l['min'])

+		$cell['miw'] = $l['min'] + $this->paddingCell2;

+	if (!isset($cell['maw']) || $cell['maw'] - $this->paddingCell2 < $l['max'])

+		$cell['maw'] = $l['max'] + $this->paddingCell2;

 }

 

-private function _setImage(&$c, &$a){

+private function _setImage(&$c, &$a) {

 	$path = $a['src'];

-	if (!is_file($path)){

+	if (!is_file($path)) {

 		$this->Error('Image is not exists: '.$path);

-	}else{

-		list($u,$d) = $this->_getResolution($path);

+	}else {

+		list($u, $d) = $this->_getResolution($path);

 		$c['img'] = $path;

-		list($c['w'],$c['h'],) = getimagesize($path);

+		list($c['w'], $c['h'],) = getimagesize($path);

 		if (isset($a['width'])) $c['w'] = $a['width'];

 		if (isset($a['height'])) $c['h'] = $a['height'];

 		$scale = 1;

-		if ($u==1) $scale = 25.4/$d;

-		elseif ($u==2) $scale = 10/$d;

-		$c['w'] = intval($c['w']*$scale);

-		$c['h'] = intval($c['h']*$scale);

+		if ($u == 1) $scale = 25.4 / $d;

+		elseif ($u == 2) $scale = 10 / $d;

+		$c['w'] = intval($c['w'] * $scale);

+		$c['h'] = intval($c['h'] * $scale);

 	}

 }

-private function _getResolution($path){

-	$pos=strrpos($path,'.');

-	if(!$pos)

+private function _getResolution($path) {

+	$pos = strrpos($path, '.');

+	if (!$pos)

 		$this->Error('Image file has no extension and no type was specified: '.$path);

-	$type=substr($path,$pos+1);

-	$type=strtolower($type);

-	if($type=='jpeg')

-		$type='jpg';

-	if ($type!='jpg')

+	$type = substr($path, $pos + 1);

+	$type = strtolower($type);

+	if ($type == 'jpeg')

+		$type = 'jpg';

+	if ($type != 'jpg')

 		$this->Error('Unsupported image type: '.$path);

-	$f = fopen($path,'r');

-	fseek($f,13,SEEK_SET);

-	$info = fread($f,3);

+	$f = fopen($path, 'r');

+	fseek($f, 13, SEEK_SET);

+	$info = fread($f, 3);

     fclose($f);

     $iUnit = ord($info{0});

     $iX = ord($info{1}) * 256 + ord($info{2});

     return array($iUnit, $iX);

 }

-private function _html2text($text){

-	$text = str_replace('&nbsp;',' ',$text);

-	$text = str_replace('&lt;','<',$text);

+private function _html2text($text) {

+	$text = str_replace('&nbsp;', ' ', $text);

+	$text = str_replace('&lt;', '<', $text);

 	return $text;

 }

 

@@ -418,37 +418,37 @@ 
  * wc		List of width of each column

  * cells	List of cells of each rows, cells[i][j] is a cell in table

  */

-private function _tableColumnWidth(&$table){

+private function _tableColumnWidth(&$table) {

 	$cs = &$table['cells'];

 	$nc = $table['nc'];

 	$nr = $table['nr'];

 	$listspan = array();

 	//Xac dinh do rong cua cac cell va cac cot tuong ung

-	for ($j=0;$j<$nc;$j++){

+	for ($j = 0; $j < $nc; $j++) {

 		$wc = &$table['wc'][$j];

-		for ($i=0;$i<$nr;$i++){

-			if (isset($cs[$i][$j]['miw'])){

+		for ($i = 0; $i < $nr; $i++) {

+			if (isset($cs[$i][$j]['miw'])) {

 				$c   = &$cs[$i][$j];

 				if (isset($c['nowrap'])) $c['miw'] = $c['maw'];

-				if (isset($c['w'])){

-					if ($c['miw']<$c['w']) $c['miw'] = $c['w'];

-					elseif ($c['miw']>$c['w']) $c['w'] = $c['miw']+$this->paddingCell2;

+				if (isset($c['w'])) {

+					if ($c['miw'] < $c['w']) $c['miw'] = $c['w'];

+					elseif ($c['miw'] > $c['w']) $c['w'] = $c['miw'] + $this->paddingCell2;

 					if (!isset($wc['w'])) $wc['w'] = 1;

 				}

-				if ($c['maw']<$c['miw']) $c['maw'] = $c['miw'];

-				if (!isset($c['colspan'])){

-					if ($wc['miw'] < $c['miw']) $wc['miw']=$c['miw'];

-					if ($wc['maw'] < $c['maw']) $wc['maw']=$c['maw'];

+				if ($c['maw'] < $c['miw']) $c['maw'] = $c['miw'];

+				if (!isset($c['colspan'])) {

+					if ($wc['miw'] < $c['miw']) $wc['miw'] = $c['miw'];

+					if ($wc['maw'] < $c['maw']) $wc['maw'] = $c['maw'];

 					if (isset($wc['w']) && $wc['w'] < $wc['miw'])

-						$wc['w']=$wc['miw'];

-				}else $listspan[] = array($i,$j);

+						$wc['w'] = $wc['miw'];

+				}else $listspan[] = array($i, $j);

 			}

 		}

 	}

 	//Xac dinh su anh huong cua cac cell colspan len cac cot va nguoc lai

 	$wc = &$table['wc'];

-	foreach ($listspan as $span){

-		list($i,$j) = $span;

+	foreach ($listspan as $span) {

+		list($i, $j) = $span;

 		$c = &$cs[$i][$j];

 		$lc = $j + $c['colspan'];

 		if ($lc > $nc) $lc = $nc;

@@ -456,39 +456,39 @@ 
 		$wis = $wisa = 0;

 		$was = $wasa = 0;

 		$list = array();

-		for($k=$j;$k<$lc;$k++){

+		for ($k = $j; $k < $lc; $k++) {

 			$wis += $wc[$k]['miw'];

 			$was += $wc[$k]['maw'];

-			if (!isset($c['w'])){

+			if (!isset($c['w'])) {

 				$list[] = $k;

 				$wisa += $wc[$k]['miw'];

 				$wasa += $wc[$k]['maw'];

 			}

 		}

-		if ($c['miw'] > $wis){

-			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['miw'] = $c['miw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+		if ($c['miw'] > $wis) {

+			if (!$wis) {//Cac cot chua co kich thuoc => chia deu

+				for ($k = $j; $k < $lc; $k++) $wc[$k]['miw'] = $c['miw'] / $c['colspan'];

+			}elseif (!count($list)) {//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['miw'] - $wis;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for ($k = $j; $k < $lc; $k++)

+					$wc[$k]['miw'] += ($wc[$k]['miw'] / $wis) * $wi;

+			}else {//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['miw'] - $wis;

 				foreach ($list as $_z2=>$k)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wisa)*$wi;

+					$wc[$k]['miw'] += ($wc[$k]['miw'] / $wisa) * $wi;

 			}

 		}

-		if ($c['maw'] > $was){

-			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['maw'] = $c['maw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+		if ($c['maw'] > $was) {

+			if (!$wis) {//Cac cot chua co kich thuoc => chia deu

+				for ($k = $j; $k < $lc; $k++) $wc[$k]['maw'] = $c['maw'] / $c['colspan'];

+			}elseif (!count($list)) {//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['maw'] - $was;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for ($k = $j; $k < $lc; $k++)

+					$wc[$k]['maw'] += ($wc[$k]['maw'] / $was) * $wi;

+			}else {//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['maw'] - $was;

 				foreach ($list as $_z2=>$k)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$wasa)*$wi;

+					$wc[$k]['maw'] += ($wc[$k]['maw'] / $wasa) * $wi;

 			}

 		}

 	}

@@ -497,43 +497,43 @@ 
 /**

  * @desc Xac dinh chieu rong cua table

  */

-private function _tableWidth(&$table){

+private function _tableWidth(&$table) {

 	$wc = &$table['wc'];

 	$nc = $table['nc'];

 	$a = 0;

-	for ($i=0;$i<$nc;$i++){

+	for ($i = 0; $i < $nc; $i++) {

 		$a += isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

 	}

 	if ($a > $this->width) $table['w'] = $this->width;

 

-	if (isset($table['w'])){

+	if (isset($table['w'])) {

 		$wis = $wisa = 0;

 		$list = array();

-		for ($i=0;$i<$nc;$i++){

+		for ($i = 0; $i < $nc; $i++) {

 			$wis += $wc[$i]['miw'];

-			if (!isset($wc[$i]['w'])){ $list[] = $i;$wisa += $wc[$i]['miw'];}

+			if (!isset($wc[$i]['w'])) { $list[] = $i; $wisa += $wc[$i]['miw']; }

 		}

-		if ($table['w'] > $wis){

-			if (!count($list)){

+		if ($table['w'] > $wis) {

+			if (!count($list)) {

 				//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

-				$wi = ($table['w'] - $wis)/$nc;

-				for($k=0;$k<$nc;$k++)

+				$wi = ($table['w'] - $wis) / $nc;

+				for ($k = 0; $k < $nc; $k++)

 					$wc[$k]['miw'] += $wi;

-			}else{

+			}else {

 				//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

-				$wi = ($table['w'] - $wis)/count($list);

+				$wi = ($table['w'] - $wis) / count($list);

 				foreach ($list as $k)

 					$wc[$k]['miw'] += $wi;

 			}

 		}

-		for ($i=0;$i<$nc;$i++){

+		for ($i = 0; $i < $nc; $i++) {

 			$a = $wc[$i]['miw'];

 			unset($wc[$i]);

 			$wc[$i] = $a;

 		}

-	}else{

+	}else {

 		$table['w'] = $a;

-		for ($i=0;$i<$nc;$i++){

+		for ($i = 0; $i < $nc; $i++) {

 			$a = isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

 			unset($wc[$i]);

 			$wc[$i] = $a;

@@ -542,99 +542,99 @@ 
 	$table['w'] = array_sum($wc);

 }

 

-private function _tableHeight(&$table){

+private function _tableHeight(&$table) {

 	$cs = &$table['cells'];

 	$nc = $table['nc'];

 	$nr = $table['nr'];

 	$listspan = array();

-	for ($i=0;$i<$nr;$i++){

+	for ($i = 0; $i < $nr; $i++) {

 		$hr = &$table['hr'][$i];

-		for ($j=0;$j<$nc;$j++){

-			if (isset($cs[$i][$j]['miw'])){

+		for ($j = 0; $j < $nc; $j++) {

+			if (isset($cs[$i][$j]['miw'])) {

 				$c = &$cs[$i][$j];

-				$this->_tableGetWCell($table, $i,$j); //create $c['x0'], $c['w0']

+				$this->_tableGetWCell($table, $i, $j); //create $c['x0'], $c['w0']

 

 				$ch = $this->_cellHeight($c);

 				$c['ch'] = $ch;

 

 				if (isset($c['h']) && $c['h'] > $ch) $ch = $c['h'];

 

-				if (isset($c['rowspan'])) $listspan[] = array($i,$j);

+				if (isset($c['rowspan'])) $listspan[] = array($i, $j);

 				elseif ($hr < $ch) $hr = $ch;

 				$c['mih'] = $ch;

 			}

 		}

 	}

 	$hr = &$table['hr'];

-	foreach ($listspan as $span){

-		list($i,$j) = $span;

+	foreach ($listspan as $span) {

+		list($i, $j) = $span;

 		$c = &$cs[$i][$j];

 		$lr = $i + $c['rowspan'];

 		if ($lr > $nr) $lr = $nr;

 		$hs = $hsa = 0;

 		$list = array();

-		for($k=$i;$k<$lr;$k++){

+		for ($k = $i; $k < $lr; $k++) {

 			$hs += $hr[$k];

-			if (!isset($c['h'])){

+			if (!isset($c['h'])) {

 				$list[] = $k;

 				$hsa += $hr[$k];

 			}

 		}

-		if ($c['mih'] > $hs){

-			if (!$hs){//Cac dong chua co kich thuoc => chia deu

-				for($k=$i;$k<$lr;$k++) $hr[$k] = $c['mih']/$c['rowspan'];

-			}elseif (!count($list)){

+		if ($c['mih'] > $hs) {

+			if (!$hs) {//Cac dong chua co kich thuoc => chia deu

+				for ($k = $i; $k < $lr; $k++) $hr[$k] = $c['mih'] / $c['rowspan'];

+			}elseif (!count($list)) {

 				//Khong co dong nao co kich thuoc auto => chia deu phan du cho tat ca

 				$hi = $c['mih'] - $hs;

-				for($k=$i;$k<$lr;$k++)

-					$hr[$k] += ($hr[$k]/$hs)*$hi;

-			}else{

+				for ($k = $i; $k < $lr; $k++)

+					$hr[$k] += ($hr[$k] / $hs) * $hi;

+			}else {

 				//Co mot so dong co kich thuoc auto => chia deu phan du cho cac dong auto

 				$hi = $c['mih'] - $hsa;

 				foreach ($list as $k)

-					$hr[$k] += ($hr[$k]/$hsa)*$hi;

+					$hr[$k] += ($hr[$k] / $hsa) * $hi;

 			}

 		}

 	}

 	$table['repeatH'] = 0;

-	if (count($table['repeat'])){

+	if (count($table['repeat'])) {

 		foreach ($table['repeat'] as $i) $table['repeatH'] += $hr[$i];

 	}else $table['repeat'] = 0;

 	$tth = 0;

-	foreach ($hr as $v) $tth+=$v;

+	foreach ($hr as $v) $tth += $v;

 	$table['tth'] = $tth;

 }

 

 /**

  * @desc Xac dinh toa do va do rong cua mot cell

  */

-private function _tableGetWCell(&$table, $i,$j){

+private function _tableGetWCell(&$table, $i, $j) {

 	$c = &$table['cells'][$i][$j];

-	if ($c){

+	if ($c) {

 		if (isset($c['x0'])) return array($c['x0'], $c['w0']);

 		$x = 0;

 		$wc = &$table['wc'];

-		for ($k=0;$k<$j;$k++) $x += $wc[$k];

+		for ($k = 0; $k < $j; $k++) $x += $wc[$k];

 		$w = $wc[$j];

-		if (isset($c['colspan'])){

-			for ($k=$j+$c['colspan']-1;$k>$j;$k--)

+		if (isset($c['colspan'])) {

+			for ($k = $j + $c['colspan'] - 1; $k > $j; $k--)

 				$w += @$wc[$k];

 		}

 		$c['x0'] = $x;

 		$c['w0'] = $w;

 		return array($x, $w);

 	}

-	return array(0,0);

+	return array(0, 0);

 }

 

-private function _tableGetHCell(&$table, $i,$j){

+private function _tableGetHCell(&$table, $i, $j) {

 	$c = &$table['cells'][$i][$j];

-	if ($c){

+	if ($c) {

 		if (isset($c['h0'])) return $c['h0'];

 		$hr = &$table['hr'];

 		$h = $hr[$i];

-		if (isset($c['rowspan'])){

-			for ($k=$i+$c['rowspan']-1;$k>$i;$k--)

+		if (isset($c['rowspan'])) {

+			for ($k = $i + $c['rowspan'] - 1; $k > $i; $k--)

 				$h += $hr[$k];

 		}

 		$c['h0'] = $h;

@@ -643,18 +643,18 @@ 
 	return 0;

 }

 

-private function _tableRect($x, $y, $w, $h, $type=1){

-	if (strlen($type)==4)

+private function _tableRect($x, $y, $w, $h, $type = 1) {

+	if (strlen($type) == 4)

 	{

 		$x2 = $x + $w; $y2 = $y + $h;

-		if (intval($type{0})) $this->Line($x , $y , $x2, $y );

-		if (intval($type{1})) $this->Line($x2, $y , $x2, $y2);

-		if (intval($type{2})) $this->Line($x , $y2, $x2, $y2);

-		if (intval($type{3})) $this->Line($x , $y , $x , $y2);

+		if (intval($type{0})) $this->Line($x, $y, $x2, $y);

+		if (intval($type{1})) $this->Line($x2, $y, $x2, $y2);

+		if (intval($type{2})) $this->Line($x, $y2, $x2, $y2);

+		if (intval($type{3})) $this->Line($x, $y, $x, $y2);

 	}

-	elseif ((int)$type===1)

+	elseif ((int) $type === 1)

 		$this->Rect($x, $y, $w, $h);

-	elseif ((int)$type>1 && (int)$type<11)

+	elseif ((int) $type > 1 && (int) $type < 11)

 	{

 		$width = $this->LineWidth;

 		$this->SetLineWidth($type * $this->LineWidth);

@@ -663,73 +663,73 @@ 
 	}

 }

 

-private function _tableDrawBorder(&$table){

+private function _tableDrawBorder(&$table) {

 	//When fill a cell, it overwrite the border of prevous cell, then I have to draw border at the end

-	foreach ($table['listborder'] as $c){

-		list($x,$y,$w,$h,$s) = $c;

-		$this->_tableRect($x,$y,$w,$h,$s);

+	foreach ($table['listborder'] as $c) {

+		list($x, $y, $w, $h, $s) = $c;

+		$this->_tableRect($x, $y, $w, $h, $s);

 	}

 

 	$table['listborder'] = array();

 }

-private function _getRowHeight(&$table,$i){

+private function _getRowHeight(&$table, $i) {

 	$maxh = 0;

-	for ($j=0;$j<$table['nc'];$j++){

+	for ($j = 0; $j < $table['nc']; $j++) {

 		$h = $this->_tableGetHCell($table, $i, $j);

 		if ($maxh < $h) $maxh = $h;

 	}

 	return $maxh;

 }

-private function _checkLimitHeight(&$table,$maxh){

-	if ($maxh+$table['repeatH'] > $this->height){

+private function _checkLimitHeight(&$table, $maxh) {

+	if ($maxh + $table['repeatH'] > $this->height) {

 		$msg = 'Height of this row is greater than page height!';

-		$this->SetFillColor(255,0,0);

-		$h=$this->bottom-$table['lasty'];

-		$this->Rect($this->x, $this->y=$table['lasty'], $table['w'], $h, 'F');

-		$this->MultiCell($table['w'],$h,$msg);

+		$this->SetFillColor(255, 0, 0);

+		$h = $this->bottom - $table['lasty'];

+		$this->Rect($this->x, $this->y = $table['lasty'], $table['w'], $h, 'F');

+		$this->MultiCell($table['w'], $h, $msg);

 		$table['lasty'] += $h;

 		return 1;

 	}

 	return 0;

 }

-private function _tableWriteRow(&$table,$i,$x0){

+private function _tableWriteRow(&$table, $i, $x0) {

 	$maxh = $this->_getRowHeight($table, $i);

-	if ($table['multipage']){

+	if ($table['multipage']) {

 		$newpage = 0;

-		if ($table['lasty']+$maxh>$this->bottom){

+		if ($table['lasty'] + $maxh > $this->bottom) {

 			if ($this->_checkLimitHeight($table, $maxh)) return;

 			$newpage = 1;

-		}elseif (isset($table['pbr'][$i])){

+		}elseif (isset($table['pbr'][$i])) {

 			$newpage = 1;

 			unset($table['pbr'][$i]);

-		}elseif (isset($table['knext'][$i])&&$i<$table['nr']-1){

+		}elseif (isset($table['knext'][$i]) && $i < $table['nr'] - 1) {

 			$mrowh = $maxh;

-			for($j=$i+1;$j<$table['nr'];$j++){

+			for ($j = $i + 1; $j < $table['nr']; $j++) {

 				$mrowh += $this->_getRowHeight($table, $j);

 				if (!isset($table['knext'][$j])) break;

 				unset($table['knext'][$j]);

 			}

 			if ($this->_checkLimitHeight($table, $mrowh)) return;

-			$newpage = $table['lasty']+$mrowh>$this->bottom;

+			$newpage = $table['lasty'] + $mrowh > $this->bottom;

 		}

-		if ($newpage){

+		if ($newpage) {

 			$this->_tableDrawBorder($table);

 			$this->AddPage($this->CurOrientation);

 	

 			$table['lasty'] = $this->y;

-			if ($table['repeat']){

-				foreach ($table['repeat'] as $r){

-					if ($r==$i) continue;

-					$this->_tableWriteRow($table,$r,$x0);

+			if ($table['repeat']) {

+				foreach ($table['repeat'] as $r) {

+					if ($r == $i) continue;

+					$this->_tableWriteRow($table, $r, $x0);

 				}

 			}

 		}

 	}

 	$y = $table['lasty'];

-	for ($j=0;$j<$table['nc'];$j++){

-		if (isset($table['cells'][$i][$j]['miw'])){

+	for ($j = 0; $j < $table['nc']; $j++) {

+		if (isset($table['cells'][$i][$j]['miw'])) {

 			$c = &$table['cells'][$i][$j];

-			list($x,$w) = $this->_tableGetWCell($table, $i, $j);

+			list($x, $w) = $this->_tableGetWCell($table, $i, $j);

 			$h = $this->_tableGetHCell($table, $i, $j);

 			$x += $x0;

 			

@@ -737,41 +737,41 @@ 
 			$fill = isset($c['bgcolor']) ? $c['bgcolor']

 				: (isset($table['bgcolor'][$i]) ? $table['bgcolor'][$i]

 				: (isset($table['bgcolor'][-1]) ? $table['bgcolor'][-1] : 0));

-			if ($fill){

+			if ($fill) {

 				$color = Color::HEX2RGB($fill);

-				$this->SetFillColor($color[0],$color[1],$color[2]);

+				$this->SetFillColor($color[0], $color[1], $color[2]);

 				$this->Rect($x, $y, $w, $h, 'F');

 			};

 			//Content

-			if (isset($c['img'])){

-				$this->Image($c['img'],$x,$y,$c['w'],$c['h']);

-			}else{

-				$this->_drawCellAligned($x,$y,$c);

+			if (isset($c['img'])) {

+				$this->Image($c['img'], $x, $y, $c['w'], $c['h']);

+			}else {

+				$this->_drawCellAligned($x, $y, $c);

 			}

 			//Border

-			if (isset($c['border'])){

-				$table['listborder'][] = array($x,$y,$w,$h,$c['border']);

+			if (isset($c['border'])) {

+				$table['listborder'][] = array($x, $y, $w, $h, $c['border']);

 			}elseif (isset($table['border']) && $table['border'])

-				$table['listborder'][] = array($x,$y,$w,$h,$table['border']);

+				$table['listborder'][] = array($x, $y, $w, $h, $table['border']);

 		}

 	}

 	$table['lasty'] += $table['hr'][$i];

 	$this->y = $table['lasty'];

 }

-function SetFont($family, $style='', $size=0, $default=false){

+function SetFont($family, $style = '', $size = 0, $default = false) {

 	parent::SetFont($family, $style, $size);

-	if ($default||$this->isNotYetSetFont){

+	if ($default || $this->isNotYetSetFont) {

 		$this->defaultFontFamily = $family;

 		$this->defaultFontSize = $size;

 		$this->defaultFontStyle = $style;

 		$this->isNotYetSetFont = false;

 	}

 }

-private function _setFontText(&$f){

-	if (isset($f['size']) && ($f['size'] >0)){

+private function _setFontText(&$f) {

+	if (isset($f['size']) && ($f['size'] > 0)) {

 		$fontSize   = $f['size'];

 	}else $fontSize   = $this->defaultFontSize;

-	if (isset($f['family'])){

+	if (isset($f['family'])) {

 		$fontFamily = $f['family'];

 	}else $fontFamily = $this->defaultFontFamily;

 	if (isset($f['style']))

@@ -780,45 +780,45 @@ 
 	$this->SetFont($fontFamily, $fontStyle, $fontSize);

 	return $fontSize;

 }

-private function _tableWrite(&$table){

-	if ($this->CurOrientation == 'P' && $table['w']>$this->width+5){

+private function _tableWrite(&$table) {

+	if ($this->CurOrientation == 'P' && $table['w'] > $this->width + 5) {

 		$this->AddPage('L');

 	}

-	if ($this->x==null)$this->x = $this->lMargin;

-	if ($this->y==null)$this->y = $this->tMargin;

+	if ($this->x == null)$this->x = $this->lMargin;

+	if ($this->y == null)$this->y = $this->tMargin;

 	$x0 = $this->x;

 	$y0 = $this->y;

-	if (isset($table['a'])){

-		if ($table['a']=='C'){

-			$x0 += (($this->right-$x0) - $table['w'])/2;

-		}elseif ($table['a']=='R'){

+	if (isset($table['a'])) {

+		if ($table['a'] == 'C') {

+			$x0 += (($this->right - $x0) - $table['w']) / 2;

+		}elseif ($table['a'] == 'R') {

 			$x0 = $this->right - $table['w'];

 		}

 	}

-	if (isset($table['nobreak'])&&$table['nobreak']

-		&& $table['tth']+$y0>$this->bottom && $table['multipage']){

+	if (isset($table['nobreak']) && $table['nobreak']

+		&& $table['tth'] + $y0 > $this->bottom && $table['multipage']) {

 		$this->AddPage($this->CurOrientation);

 		$table['lasty'] = $this->y;

 	}else

 		$table['lasty'] = $y0;

 	

 	$table['listborder'] = array();

-	for ($i=0;$i<$table['nr'];$i++) $this->_tableWriteRow($table, $i, $x0);

+	for ($i = 0; $i < $table['nr']; $i++) $this->_tableWriteRow($table, $i, $x0);

 	$this->_tableDrawBorder($table);

 	$this->x = $x0;

 }

 

-function htmltable(&$html,$multipage=1){

+function htmltable(&$html, $multipage = 1) {

 	$a = $this->AutoPageBreak;

-	$this->SetAutoPageBreak(0,$this->bMargin);

+	$this->SetAutoPageBreak(0, $this->bMargin);

 	$HTML = explode("<table", $html);

 	$oldMargin = $this->cMargin;

 	$this->cMargin = 0;

 	$x = $this->x;

-	foreach ($HTML as $i=>$table){	

+	foreach ($HTML as $i=>$table) {	

 		$this->x = $x;

-		if (strlen($table)<6) continue;

-		$table = '<table' . $table;

+		if (strlen($table) < 6) continue;

+		$table = '<table'.$table;

 		$table = $this->_tableParser($table);

 		$table['multipage'] = $multipage;

 		$this->_tableColumnWidth($table);

@@ -827,32 +827,32 @@ 
 		$this->_tableWrite($table);

 	}

 	$this->cMargin = $oldMargin;

-	$this->SetAutoPageBreak($a,$this->bMargin);

+	$this->SetAutoPageBreak($a, $this->bMargin);

 }

-function _putinfo(){

+function _putinfo() {

 	$this->_out('/Producer '.$this->_textstring('PDFTable '.

 		PDFTABLE_VERSION.' based on FPDF '.FPDF_VERSION));

-	if(!empty($this->title))

+	if (!empty($this->title))

 		$this->_out('/Title '.$this->_textstring($this->title));

-	if(!empty($this->subject))

+	if (!empty($this->subject))

 		$this->_out('/Subject '.$this->_textstring($this->subject));

-	if(!empty($this->author))

+	if (!empty($this->author))

 		$this->_out('/Author '.$this->_textstring($this->author));

-	if(!empty($this->keywords))

+	if (!empty($this->keywords))

 		$this->_out('/Keywords '.$this->_textstring($this->keywords));

-	if(!empty($this->creator))

+	if (!empty($this->creator))

 		$this->_out('/Creator '.$this->_textstring($this->creator));

 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

-private function getAlign($v){

+private function getAlign($v) {

 	global $PDF_ALIGN;

 	$v = strtolower($v);

-	return isset($PDF_ALIGN[$v])?$PDF_ALIGN[$v]:'L';

+	return isset($PDF_ALIGN[$v]) ? $PDF_ALIGN[$v] : 'L';

 }

-private function getVAlign($v){

+private function getVAlign($v) {

 	global $PDF_VALIGN;

 	$v = strtolower($v);

-	return isset($PDF_VALIGN[$v])?$PDF_VALIGN[$v]:'T';

+	return isset($PDF_VALIGN[$v]) ? $PDF_VALIGN[$v] : 'T';

 }

 }//PDFTable

 ?>
\ No newline at end of file

Braces +383 added lines, -175 removed lines

@@ -65,9 +65,13 @@ 
 }

 

 function SetHeaderFooter($header='',$footer=''){

-	if ($header) $this->headerTable = $header;

-	if ($footer) $this->footerTable = $footer;

-}

+	if ($header) {

+		$this->headerTable = $header;

+	}

+	if ($footer) {

+		$this->footerTable = $footer;

+	}

+	}

 function Header(){

 	$this->_makePageSize();

 	if ($this->headerTable){

@@ -97,7 +101,9 @@ 
  * Tra ve chieu cao cua 1 dong theo font hien hanh

  */

 function getLineHeight($fontSize = 0){

-	if ($fontSize == 0) $fontSize = $this->FontSizePt;

+	if ($fontSize == 0) {

+		$fontSize = $this->FontSizePt;

+	}

 	return $fontSize*2/$this->k;

 }

 

@@ -114,19 +120,26 @@ 
 	foreach ($c['font'] as &$f){

 		$this->_setFontText($f);

 		$hl = $this->getLineHeight();

-		if ($maxline<$hl || $x==$this->paddingCell) $maxline=$hl;

-		if (!isset($f['space'])) continue;

+		if ($maxline<$hl || $x==$this->paddingCell) {

+			$maxline=$hl;

+		}

+		if (!isset($f['space'])) {

+			continue;

+		}

 		$space = $f['space'];

 		foreach ($f['line'] as $i=>&$l){

-			if ($x!=$this->paddingCell) $x+=$space;

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

+			if ($x!=$this->paddingCell) {

+				$x+=$space;

+			}

+			if (isset($l['str'])&&is_array($l['str'])) {

+						foreach ($l['str'] as &$t){

 				if (!is_array($t)) continue;

+			}

 				if ($x==$this->paddingCell||$x+$t[1]<=$maxw){

 					$c['wlinet'][$countline][0] += $t[1];

 					$c['wlinet'][$countline][1]++;

 					$x += $t[1]+(($x>$this->paddingCell)?$space:0);

-				}else{//auto break line

+				} else{//auto break line

 					$h+=$maxline*FHR + $this->spacingLine;

 					$c['hline'][] = $maxline*FHR + $this->spacingLine;

 					$c['wlines'][$countline] = $x-$this->paddingCell;

@@ -158,8 +171,14 @@ 
 	$maxw = $c['w0']-$this->paddingCell2;

 	$curh = $c['maxh'];

 	$x=$y=0; //Top by default

-	if ($c['va']=='M') $y = ($maxh-$curh)/2; //Middle

-	elseif ($c['va']=='B') $y = $maxh-$curh; //Bottom

+	if ($c['va']=='M') {

+		$y = ($maxh-$curh)/2;

+	}

+	//Middle

+	elseif ($c['va']=='B') {

+		$y = $maxh-$curh;

+	}

+	//Bottom

 	$curline = 0;

 	$morespace = 0;

 	$cl = $c['hline'][$curline];

@@ -169,15 +188,21 @@ 
 		if (isset($f['color'])){

 			$color = Color::HEX2RGB($f['color']);

 			$this->SetTextColor($color[0],$color[1],$color[2]);

-		}else unset($color);

+		} else {

+			unset($color);

+		}

 		$hl = $this->getLineHeight();

-		if (!isset($f['space'])) continue;

+		if (!isset($f['space'])) {

+			continue;

+		}

 		$space = $f['space'];

 		foreach ($f['line'] as $i=>&$l){

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

+			if (isset($l['str'])&&is_array($l['str'])) {

+						foreach ($l['str'] as &$t){

 				if ($t[2]!=$curline){

-					$y += $cl;$curline++;$cl = $c['hline'][$curline];

+					$y += $cl;

+			}

+			$curline++;$cl = $c['hline'][$curline];

 					$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

 				}

 				$this->x = $x+$x0;

@@ -190,31 +215,38 @@ 
 				$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

 			}

 		}

-		if (isset($color))

-			$this->SetTextColor(0);

+		if (isset($color)) {

+					$this->SetTextColor(0);

+		}

 	}

 }

 private function _cellHorzAlignLine(&$c,$line,$maxw,&$x,&$morespace){

 	$morespace = 0;

 	$x = $this->paddingCell;//Left by default

-	if (!isset($c['wlines'][$line])) return ;

+	if (!isset($c['wlines'][$line])) {

+		return ;

+	}

 	if ($c['a']=='C'){//Center

 		$x = ($maxw-$c['wlines'][$line])/2;

-	}elseif ($c['a']=='R'){

+	} elseif ($c['a']=='R'){

 		$x = $maxw-$c['wlines'][$line];

-	}elseif ($c['a']=='J' && $c['wlinet'][$line][1]>1

+	} elseif ($c['a']=='J' && $c['wlinet'][$line][1]>1

 		&& isset($c['autobr'][$line])){//Justify

 		$morespace = ($maxw-$c['wlines'][$line])/($c['wlinet'][$line][1]-1);

 	}

-	if ($x < $this->paddingCell) $x = $this->paddingCell;

-}

+	if ($x < $this->paddingCell) {

+		$x = $this->paddingCell;

+	}

+	}

 

 private function _calWidth($w){

 	$p = strpos($w,'%');

 	if ($p!==false){

 		return intval(substr($w,0,$p)*$this->width/100);

-	}else return intval($w);

-}

+	} else {

+		return intval($w);

+	}

+	}

 /**

  * @return array

  * @desc Parse a string in html and return array of attribute of table

@@ -229,8 +261,9 @@ 
 	$tdopen = false;

 	foreach ($t->name as $i=>$element){

 		if ($fontopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

-			&& (in_array($element,array('table','tr','td','font'))))

-				$fontopen = false;

+			&& (in_array($element,array('table','tr','td','font')))) {

+						$fontopen = false;

+		}

 		if ($tdopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

 			&& (in_array($element,array('table','tr','td')))

 			&& !isset($cell[$row][$col]['miw'])){

@@ -238,16 +271,26 @@ 
 				$c['miw'] = $c['maw'] = 0;

 				$tdopen = false;

 		}

-		if ($t->type[$i] != NODE_TYPE_ELEMENT && $t->type[$i] != NODE_TYPE_TEXT) continue;

+		if ($t->type[$i] != NODE_TYPE_ELEMENT && $t->type[$i] != NODE_TYPE_TEXT) {

+			continue;

+		}

 		switch ($element){

 			case 'table':

 				$tdopen = 0;

 				$a	= &$t->attribute[$i];

-				if (isset($a['width']))		$table['w']	= $this->_calWidth($a['width']);

-				if (isset($a['height']))	$table['h']	= intval($a['height']);

-				if (isset($a['align']))		$table['a']	= $this->getAlign(strtolower($a['align']));

+				if (isset($a['width'])) {

+					$table['w']	= $this->_calWidth($a['width']);

+				}

+				if (isset($a['height'])) {

+					$table['h']	= intval($a['height']);

+				}

+				if (isset($a['align'])) {

+					$table['a']	= $this->getAlign(strtolower($a['align']));

+				}

 				$table['border'] = (isset($a['border']))?	$a['border']: 0;

-				if (isset($a['bgcolor']))	$table['bgcolor'][-1]	= $a['bgcolor'];

+				if (isset($a['bgcolor'])) {

+					$table['bgcolor'][-1]	= $a['bgcolor'];

+				}

 				$table['nobreak'] = isset($a['nobreak']);

 				break;

 			case 'tr':

@@ -256,52 +299,94 @@ 
 				$table['nr']++;

 				$col = -1;

 				$a	= &$t->attribute[$i];

-				if (isset($a['bgcolor']))	$table['bgcolor'][$row]	= $a['bgcolor'];

-				if (isset($a['repeat']))	$table['repeat'][]		= $row;

-				else{

-					if (isset($a['pbr']))	$table['pbr'][$row]	= 1;

-					if (isset($a['knext']))	$table['knext'][$row]	= 1;

+				if (isset($a['bgcolor'])) {

+					$table['bgcolor'][$row]	= $a['bgcolor'];

+				}

+				if (isset($a['repeat'])) {

+					$table['repeat'][]		= $row;

+				} else{

+					if (isset($a['pbr'])) {

+						$table['pbr'][$row]	= 1;

+					}

+					if (isset($a['knext'])) {

+						$table['knext'][$row]	= 1;

+					}

 				}

 				break;

 			case 'td':

 				$tdopen = 1;

-				$col++;while (isset($cell[$row][$col])) $col++;

+				$col++;while (isset($cell[$row][$col])) {

+					$col++;

+				}

 				//Update number column

-				if ($table['nc'] < $col+1)		$table['nc']		= $col+1;

+				if ($table['nc'] < $col+1) {

+					$table['nc']		= $col+1;

+				}

 				$cell[$row][$col] = array();

 				$c = &$cell[$row][$col];

 				$a	= &$t->attribute[$i];

-				if (isset($a['width']))		$c['w']		= intval($a['width']);

-				if (isset($a['height']))	$c['h']		= intval($a['height']);

+				if (isset($a['width'])) {

+					$c['w']		= intval($a['width']);

+				}

+				if (isset($a['height'])) {

+					$c['h']		= intval($a['height']);

+				}

 				$c['a'] = isset($a['align'])?$this->getAlign($a['align']):'L';

 				$c['va']= isset($a['valign'])?$this->getVAlign($a['valign']):'T';

-				if (isset($a['border']))	$c['border']	= $a['border'];

-					else					$c['border']	= $table['border'];

-				if (isset($a['bgcolor']))	$c['bgcolor']	= $a['bgcolor'];

+				if (isset($a['border'])) {

+					$c['border']	= $a['border'];

+				} else {

+						$c['border']	= $table['border'];

+					}

+				if (isset($a['bgcolor'])) {

+					$c['bgcolor']	= $a['bgcolor'];

+				}

 				$cs = $rs = 1;

-				if (isset($a['colspan']) && $a['colspan']>1)	$cs = $c['colspan']	= intval($a['colspan']);

-				if (isset($a['rowspan']) && $a['rowspan']>1)	$rs = $c['rowspan']	= intval($a['rowspan']);

-				if (isset($a['size']))		$c['font'][0]['size']   	= $a['size'];

-				if (isset($a['family']))	$c['font'][0]['family'] 	= $a['family'];

+				if (isset($a['colspan']) && $a['colspan']>1) {

+					$cs = $c['colspan']	= intval($a['colspan']);

+				}

+				if (isset($a['rowspan']) && $a['rowspan']>1) {

+					$rs = $c['rowspan']	= intval($a['rowspan']);

+				}

+				if (isset($a['size'])) {

+					$c['font'][0]['size']   	= $a['size'];

+				}

+				if (isset($a['family'])) {

+					$c['font'][0]['family'] 	= $a['family'];

+				}

 				if (isset($a['style'])){

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach($STYLE AS $style) {

+						$fontStyle .= substr(trim($style), 0, 1);

+					}

 					$c['font'][0]['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$c['font'][0]['color'] 		= $a['color'];

+				if (isset($a['color'])) {

+					$c['font'][0]['color'] 		= $a['color'];

+				}

 				//Chiem dung vi tri de danh cho cell span

-				for ($k=$row;$k<$row+$rs;$k++) for($l=$col;$l<$col+$cs;$l++){

-					if ($k-$row || $l-$col)

-						$cell[$k][$l] = 0;

+				for ($k=$row;$k<$row+$rs;$k++) {

+					for($l=$col;

+				}

+				$l<$col+$cs;$l++){

+					if ($k-$row || $l-$col) {

+											$cell[$k][$l] = 0;

+					}

+				}

+				if (isset($a['nowrap'])) {

+					$c['nowrap']= 1;

 				}

-				if (isset($a['nowrap']))	$c['nowrap']= 1;

 				$fontopen = true;

-				if (!isset($c['font'])) $c['font'][] = array();

+				if (!isset($c['font'])) {

+					$c['font'][] = array();

+				}

 				break;

 			case 'Text':

 				$c = &$cell[$row][$col];

-				if (!$fontopen || !isset($c['font'])) $c['font'][] = array();

+				if (!$fontopen || !isset($c['font'])) {

+					$c['font'][] = array();

+				}

 				$f = &$c['font'][count($c['font'])-1];

 				$this->_setTextAndSize($c,$f,$this->_html2text($t->value[$i]));

 				break;

@@ -310,15 +395,23 @@ 
 				$c = &$cell[$row][$col];

 				$c['font'][] = array();

 				$f = &$c['font'][count($c['font'])-1];

-				if (isset($a['size']))		$f['size']   	= $a['size'];

-				if (isset($a['family']))	$f['family'] 	= $a['family'];

+				if (isset($a['size'])) {

+					$f['size']   	= $a['size'];

+				}

+				if (isset($a['family'])) {

+					$f['family'] 	= $a['family'];

+				}

 				if (isset($a['style'])){

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach($STYLE AS $style) {

+						$fontStyle .= substr(trim($style), 0, 1);

+					}

 					$f['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$f['color'] 		= $a['color'];

+				if (isset($a['color'])) {

+					$f['color'] 		= $a['color'];

+				}

 				break;

 			case 'img':

 				$a	= &$t->attribute[$i];

@@ -340,7 +433,9 @@ 
 }

 

 private function _setTextAndSize(&$cell,&$f, $text){

-	if ($text=='') return;

+	if ($text=='') {

+		return;

+	}

 	$this->_setFontText($f);

 	if (!isset($f['line'][0])){

 		$f['line'][0]['min'] = $f['line'][0]['max'] = 0;

@@ -351,49 +446,69 @@ 
 		$f['line'][] = array('min'=>0,'max'=>0,'str'=>array());

 		$l = &$f['line'][count($f['line'])-1];

 	}

-	if (!isset($f['space'])) $f['space'] = $this->GetStringWidth(' ');

+	if (!isset($f['space'])) {

+		$f['space'] = $this->GetStringWidth(' ');

+	}

 	$ct = count($text);

 	foreach ($text as $item){

 		$s = $this->GetStringWidth($item);

-		if ($l['min']<$s) $l['min']=$s;

+		if ($l['min']<$s) {

+			$l['min']=$s;

+		}

 		$l['max'] += $s;

-		if ($ct>1) $l['max'] += $f['space'];

+		if ($ct>1) {

+			$l['max'] += $f['space'];

+		}

 		$l['str'][] =  array($item,$s);

 	}

-	if (isset($cell['nowrap'])) $l['min'] = $l['max'];

-	if (!isset($cell['miw']) || $cell['miw']-$this->paddingCell2<$l['min'])

-		$cell['miw']=$l['min']+$this->paddingCell2;

-	if (!isset($cell['maw']) || $cell['maw']-$this->paddingCell2<$l['max'])

-		$cell['maw']=$l['max']+$this->paddingCell2;

-}

+	if (isset($cell['nowrap'])) {

+		$l['min'] = $l['max'];

+	}

+	if (!isset($cell['miw']) || $cell['miw']-$this->paddingCell2<$l['min']) {

+			$cell['miw']=$l['min']+$this->paddingCell2;

+	}

+	if (!isset($cell['maw']) || $cell['maw']-$this->paddingCell2<$l['max']) {

+			$cell['maw']=$l['max']+$this->paddingCell2;

+	}

+	}

 

 private function _setImage(&$c, &$a){

 	$path = $a['src'];

 	if (!is_file($path)){

 		$this->Error('Image is not exists: '.$path);

-	}else{

+	} else{

 		list($u,$d) = $this->_getResolution($path);

 		$c['img'] = $path;

 		list($c['w'],$c['h'],) = getimagesize($path);

-		if (isset($a['width'])) $c['w'] = $a['width'];

-		if (isset($a['height'])) $c['h'] = $a['height'];

+		if (isset($a['width'])) {

+			$c['w'] = $a['width'];

+		}

+		if (isset($a['height'])) {

+			$c['h'] = $a['height'];

+		}

 		$scale = 1;

-		if ($u==1) $scale = 25.4/$d;

-		elseif ($u==2) $scale = 10/$d;

+		if ($u==1) {

+			$scale = 25.4/$d;

+		} elseif ($u==2) {

+			$scale = 10/$d;

+		}

 		$c['w'] = intval($c['w']*$scale);

 		$c['h'] = intval($c['h']*$scale);

 	}

 }

 private function _getResolution($path){

 	$pos=strrpos($path,'.');

-	if(!$pos)

-		$this->Error('Image file has no extension and no type was specified: '.$path);

+	if(!$pos) {

+			$this->Error('Image file has no extension and no type was specified: '.$path);

+	}

 	$type=substr($path,$pos+1);

 	$type=strtolower($type);

-	if($type=='jpeg')

-		$type='jpg';

-	if ($type!='jpg')

-		$this->Error('Unsupported image type: '.$path);

+	if($type=='jpeg') {

+			$type='jpg';

+	}

+	if ($type!='jpg') {

+			$this->Error('Unsupported image type: '.$path);

+	}

 	$f = fopen($path,'r');

 	fseek($f,13,SEEK_SET);

 	$info = fread($f,3);

@@ -429,19 +544,35 @@ 
 		for ($i=0;$i<$nr;$i++){

 			if (isset($cs[$i][$j]['miw'])){

 				$c   = &$cs[$i][$j];

-				if (isset($c['nowrap'])) $c['miw'] = $c['maw'];

+				if (isset($c['nowrap'])) {

+					$c['miw'] = $c['maw'];

+				}

 				if (isset($c['w'])){

-					if ($c['miw']<$c['w']) $c['miw'] = $c['w'];

-					elseif ($c['miw']>$c['w']) $c['w'] = $c['miw']+$this->paddingCell2;

-					if (!isset($wc['w'])) $wc['w'] = 1;

+					if ($c['miw']<$c['w']) {

+						$c['miw'] = $c['w'];

+					} elseif ($c['miw']>$c['w']) {

+						$c['w'] = $c['miw']+$this->paddingCell2;

+					}

+					if (!isset($wc['w'])) {

+						$wc['w'] = 1;

+					}

+				}

+				if ($c['maw']<$c['miw']) {

+					$c['maw'] = $c['miw'];

 				}

-				if ($c['maw']<$c['miw']) $c['maw'] = $c['miw'];

 				if (!isset($c['colspan'])){

-					if ($wc['miw'] < $c['miw']) $wc['miw']=$c['miw'];

-					if ($wc['maw'] < $c['maw']) $wc['maw']=$c['maw'];

-					if (isset($wc['w']) && $wc['w'] < $wc['miw'])

-						$wc['w']=$wc['miw'];

-				}else $listspan[] = array($i,$j);

+					if ($wc['miw'] < $c['miw']) {

+						$wc['miw']=$c['miw'];

+					}

+					if ($wc['maw'] < $c['maw']) {

+						$wc['maw']=$c['maw'];

+					}

+					if (isset($wc['w']) && $wc['w'] < $wc['miw']) {

+											$wc['w']=$wc['miw'];

+					}

+				} else {

+					$listspan[] = array($i,$j);

+				}

 			}

 		}

 	}

@@ -451,7 +582,9 @@ 
 		list($i,$j) = $span;

 		$c = &$cs[$i][$j];

 		$lc = $j + $c['colspan'];

-		if ($lc > $nc) $lc = $nc;

+		if ($lc > $nc) {

+			$lc = $nc;

+		}

 

 		$wis = $wisa = 0;

 		$was = $wasa = 0;

@@ -467,28 +600,36 @@ 
 		}

 		if ($c['miw'] > $wis){

 			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['miw'] = $c['miw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+				for($k=$j;$k<$lc;$k++) {

+					$wc[$k]['miw'] = $c['miw']/$c['colspan'];

+				}

+			} elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['miw'] - $wis;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for($k=$j;$k<$lc;$k++) {

+									$wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi;

+				}

+			} else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['miw'] - $wis;

-				foreach ($list as $_z2=>$k)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wisa)*$wi;

+				foreach ($list as $_z2=>$k) {

+									$wc[$k]['miw'] += ($wc[$k]['miw']/$wisa)*$wi;

+				}

 			}

 		}

 		if ($c['maw'] > $was){

 			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['maw'] = $c['maw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+				for($k=$j;$k<$lc;$k++) {

+					$wc[$k]['maw'] = $c['maw']/$c['colspan'];

+				}

+			} elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['maw'] - $was;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for($k=$j;$k<$lc;$k++) {

+									$wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi;

+				}

+			} else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['maw'] - $was;

-				foreach ($list as $_z2=>$k)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$wasa)*$wi;

+				foreach ($list as $_z2=>$k) {

+									$wc[$k]['maw'] += ($wc[$k]['maw']/$wasa)*$wi;

+				}

 			}

 		}

 	}

@@ -504,7 +645,9 @@ 
 	for ($i=0;$i<$nc;$i++){

 		$a += isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

 	}

-	if ($a > $this->width) $table['w'] = $this->width;

+	if ($a > $this->width) {

+		$table['w'] = $this->width;

+	}

 

 	if (isset($table['w'])){

 		$wis = $wisa = 0;

@@ -517,13 +660,15 @@ 
 			if (!count($list)){

 				//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = ($table['w'] - $wis)/$nc;

-				for($k=0;$k<$nc;$k++)

-					$wc[$k]['miw'] += $wi;

-			}else{

+				for($k=0;$k<$nc;$k++) {

+									$wc[$k]['miw'] += $wi;

+				}

+			} else{

 				//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = ($table['w'] - $wis)/count($list);

-				foreach ($list as $k)

-					$wc[$k]['miw'] += $wi;

+				foreach ($list as $k) {

+									$wc[$k]['miw'] += $wi;

+				}

 			}

 		}

 		for ($i=0;$i<$nc;$i++){

@@ -531,7 +676,7 @@ 
 			unset($wc[$i]);

 			$wc[$i] = $a;

 		}

-	}else{

+	} else{

 		$table['w'] = $a;

 		for ($i=0;$i<$nc;$i++){

 			$a = isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

@@ -557,10 +702,15 @@ 
 				$ch = $this->_cellHeight($c);

 				$c['ch'] = $ch;

 

-				if (isset($c['h']) && $c['h'] > $ch) $ch = $c['h'];

+				if (isset($c['h']) && $c['h'] > $ch) {

+					$ch = $c['h'];

+				}

 

-				if (isset($c['rowspan'])) $listspan[] = array($i,$j);

-				elseif ($hr < $ch) $hr = $ch;

+				if (isset($c['rowspan'])) {

+					$listspan[] = array($i,$j);

+				} elseif ($hr < $ch) {

+					$hr = $ch;

+				}

 				$c['mih'] = $ch;

 			}

 		}

@@ -570,7 +720,9 @@ 
 		list($i,$j) = $span;

 		$c = &$cs[$i][$j];

 		$lr = $i + $c['rowspan'];

-		if ($lr > $nr) $lr = $nr;

+		if ($lr > $nr) {

+			$lr = $nr;

+		}

 		$hs = $hsa = 0;

 		$list = array();

 		for($k=$i;$k<$lr;$k++){

@@ -582,26 +734,36 @@ 
 		}

 		if ($c['mih'] > $hs){

 			if (!$hs){//Cac dong chua co kich thuoc => chia deu

-				for($k=$i;$k<$lr;$k++) $hr[$k] = $c['mih']/$c['rowspan'];

-			}elseif (!count($list)){

+				for($k=$i;$k<$lr;$k++) {

+					$hr[$k] = $c['mih']/$c['rowspan'];

+				}

+			} elseif (!count($list)){

 				//Khong co dong nao co kich thuoc auto => chia deu phan du cho tat ca

 				$hi = $c['mih'] - $hs;

-				for($k=$i;$k<$lr;$k++)

-					$hr[$k] += ($hr[$k]/$hs)*$hi;

-			}else{

+				for($k=$i;$k<$lr;$k++) {

+									$hr[$k] += ($hr[$k]/$hs)*$hi;

+				}

+			} else{

 				//Co mot so dong co kich thuoc auto => chia deu phan du cho cac dong auto

 				$hi = $c['mih'] - $hsa;

-				foreach ($list as $k)

-					$hr[$k] += ($hr[$k]/$hsa)*$hi;

+				foreach ($list as $k) {

+									$hr[$k] += ($hr[$k]/$hsa)*$hi;

+				}

 			}

 		}

 	}

 	$table['repeatH'] = 0;

 	if (count($table['repeat'])){

-		foreach ($table['repeat'] as $i) $table['repeatH'] += $hr[$i];

-	}else $table['repeat'] = 0;

+		foreach ($table['repeat'] as $i) {

+			$table['repeatH'] += $hr[$i];

+		}

+	} else {

+		$table['repeat'] = 0;

+	}

 	$tth = 0;

-	foreach ($hr as $v) $tth+=$v;

+	foreach ($hr as $v) {

+		$tth+=$v;

+	}

 	$table['tth'] = $tth;

 }

 

@@ -611,14 +773,19 @@ 
 private function _tableGetWCell(&$table, $i,$j){

 	$c = &$table['cells'][$i][$j];

 	if ($c){

-		if (isset($c['x0'])) return array($c['x0'], $c['w0']);

+		if (isset($c['x0'])) {

+			return array($c['x0'], $c['w0']);

+		}

 		$x = 0;

 		$wc = &$table['wc'];

-		for ($k=0;$k<$j;$k++) $x += $wc[$k];

+		for ($k=0;$k<$j;$k++) {

+			$x += $wc[$k];

+		}

 		$w = $wc[$j];

 		if (isset($c['colspan'])){

-			for ($k=$j+$c['colspan']-1;$k>$j;$k--)

-				$w += @$wc[$k];

+			for ($k=$j+$c['colspan']-1;$k>$j;$k--) {

+							$w += @$wc[$k];

+			}

 		}

 		$c['x0'] = $x;

 		$c['w0'] = $w;

@@ -630,12 +797,15 @@ 
 private function _tableGetHCell(&$table, $i,$j){

 	$c = &$table['cells'][$i][$j];

 	if ($c){

-		if (isset($c['h0'])) return $c['h0'];

+		if (isset($c['h0'])) {

+			return $c['h0'];

+		}

 		$hr = &$table['hr'];

 		$h = $hr[$i];

 		if (isset($c['rowspan'])){

-			for ($k=$i+$c['rowspan']-1;$k>$i;$k--)

-				$h += $hr[$k];

+			for ($k=$i+$c['rowspan']-1;$k>$i;$k--) {

+							$h += $hr[$k];

+			}

 		}

 		$c['h0'] = $h;

 		return $h;

@@ -647,14 +817,21 @@ 
 	if (strlen($type)==4)

 	{

 		$x2 = $x + $w; $y2 = $y + $h;

-		if (intval($type{0})) $this->Line($x , $y , $x2, $y );

-		if (intval($type{1})) $this->Line($x2, $y , $x2, $y2);

-		if (intval($type{2})) $this->Line($x , $y2, $x2, $y2);

-		if (intval($type{3})) $this->Line($x , $y , $x , $y2);

-	}

-	elseif ((int)$type===1)

-		$this->Rect($x, $y, $w, $h);

-	elseif ((int)$type>1 && (int)$type<11)

+		if (intval($type{0})) {

+			$this->Line($x , $y , $x2, $y );

+		}

+		if (intval($type{1})) {

+			$this->Line($x2, $y , $x2, $y2);

+		}

+		if (intval($type{2})) {

+			$this->Line($x , $y2, $x2, $y2);

+		}

+		if (intval($type{3})) {

+			$this->Line($x , $y , $x , $y2);

+		}

+	} elseif ((int)$type===1) {

+			$this->Rect($x, $y, $w, $h);

+	} elseif ((int)$type>1 && (int)$type<11)

 	{

 		$width = $this->LineWidth;

 		$this->SetLineWidth($type * $this->LineWidth);

@@ -676,7 +853,9 @@ 
 	$maxh = 0;

 	for ($j=0;$j<$table['nc'];$j++){

 		$h = $this->_tableGetHCell($table, $i, $j);

-		if ($maxh < $h) $maxh = $h;

+		if ($maxh < $h) {

+			$maxh = $h;

+		}

 	}

 	return $maxh;

 }

@@ -697,19 +876,25 @@ 
 	if ($table['multipage']){

 		$newpage = 0;

 		if ($table['lasty']+$maxh>$this->bottom){

-			if ($this->_checkLimitHeight($table, $maxh)) return;

+			if ($this->_checkLimitHeight($table, $maxh)) {

+				return;

+			}

 			$newpage = 1;

-		}elseif (isset($table['pbr'][$i])){

+		} elseif (isset($table['pbr'][$i])){

 			$newpage = 1;

 			unset($table['pbr'][$i]);

-		}elseif (isset($table['knext'][$i])&&$i<$table['nr']-1){

+		} elseif (isset($table['knext'][$i])&&$i<$table['nr']-1){

 			$mrowh = $maxh;

 			for($j=$i+1;$j<$table['nr'];$j++){

 				$mrowh += $this->_getRowHeight($table, $j);

-				if (!isset($table['knext'][$j])) break;

+				if (!isset($table['knext'][$j])) {

+					break;

+				}

 				unset($table['knext'][$j]);

 			}

-			if ($this->_checkLimitHeight($table, $mrowh)) return;

+			if ($this->_checkLimitHeight($table, $mrowh)) {

+				return;

+			}

 			$newpage = $table['lasty']+$mrowh>$this->bottom;

 		}

 		if ($newpage){

@@ -719,7 +904,9 @@ 
 			$table['lasty'] = $this->y;

 			if ($table['repeat']){

 				foreach ($table['repeat'] as $r){

-					if ($r==$i) continue;

+					if ($r==$i) {

+						continue;

+					}

 					$this->_tableWriteRow($table,$r,$x0);

 				}

 			}

@@ -745,14 +932,15 @@ 
 			//Content

 			if (isset($c['img'])){

 				$this->Image($c['img'],$x,$y,$c['w'],$c['h']);

-			}else{

+			} else{

 				$this->_drawCellAligned($x,$y,$c);

 			}

 			//Border

 			if (isset($c['border'])){

 				$table['listborder'][] = array($x,$y,$w,$h,$c['border']);

-			}elseif (isset($table['border']) && $table['border'])

-				$table['listborder'][] = array($x,$y,$w,$h,$table['border']);

+			} elseif (isset($table['border']) && $table['border']) {

+							$table['listborder'][] = array($x,$y,$w,$h,$table['border']);

+			}

 		}

 	}

 	$table['lasty'] += $table['hr'][$i];

@@ -770,13 +958,19 @@ 
 private function _setFontText(&$f){

 	if (isset($f['size']) && ($f['size'] >0)){

 		$fontSize   = $f['size'];

-	}else $fontSize   = $this->defaultFontSize;

+	} else {

+		$fontSize   = $this->defaultFontSize;

+	}

 	if (isset($f['family'])){

 		$fontFamily = $f['family'];

-	}else $fontFamily = $this->defaultFontFamily;

-	if (isset($f['style']))

-		$fontStyle  = $f['style'];

-	else $fontStyle = $this->defaultFontStyle;

+	} else {

+		$fontFamily = $this->defaultFontFamily;

+	}

+	if (isset($f['style'])) {

+			$fontStyle  = $f['style'];

+	} else {

+		$fontStyle = $this->defaultFontStyle;

+	}

 	$this->SetFont($fontFamily, $fontStyle, $fontSize);

 	return $fontSize;

 }

@@ -784,14 +978,18 @@ 
 	if ($this->CurOrientation == 'P' && $table['w']>$this->width+5){

 		$this->AddPage('L');

 	}

-	if ($this->x==null)$this->x = $this->lMargin;

-	if ($this->y==null)$this->y = $this->tMargin;

+	if ($this->x==null) {

+		$this->x = $this->lMargin;

+	}

+	if ($this->y==null) {

+		$this->y = $this->tMargin;

+	}

 	$x0 = $this->x;

 	$y0 = $this->y;

 	if (isset($table['a'])){

 		if ($table['a']=='C'){

 			$x0 += (($this->right-$x0) - $table['w'])/2;

-		}elseif ($table['a']=='R'){

+		} elseif ($table['a']=='R'){

 			$x0 = $this->right - $table['w'];

 		}

 	}

@@ -799,11 +997,14 @@ 
 		&& $table['tth']+$y0>$this->bottom && $table['multipage']){

 		$this->AddPage($this->CurOrientation);

 		$table['lasty'] = $this->y;

-	}else

-		$table['lasty'] = $y0;

+	} else {

+			$table['lasty'] = $y0;

+	}

 	

 	$table['listborder'] = array();

-	for ($i=0;$i<$table['nr'];$i++) $this->_tableWriteRow($table, $i, $x0);

+	for ($i=0;$i<$table['nr'];$i++) {

+		$this->_tableWriteRow($table, $i, $x0);

+	}

 	$this->_tableDrawBorder($table);

 	$this->x = $x0;

 }

@@ -817,7 +1018,9 @@ 
 	$x = $this->x;

 	foreach ($HTML as $i=>$table){	

 		$this->x = $x;

-		if (strlen($table)<6) continue;

+		if (strlen($table)<6) {

+			continue;

+		}

 		$table = '<table' . $table;

 		$table = $this->_tableParser($table);

 		$table['multipage'] = $multipage;

@@ -832,16 +1035,21 @@ 
 function _putinfo(){

 	$this->_out('/Producer '.$this->_textstring('PDFTable '.

 		PDFTABLE_VERSION.' based on FPDF '.FPDF_VERSION));

-	if(!empty($this->title))

-		$this->_out('/Title '.$this->_textstring($this->title));

-	if(!empty($this->subject))

-		$this->_out('/Subject '.$this->_textstring($this->subject));

-	if(!empty($this->author))

-		$this->_out('/Author '.$this->_textstring($this->author));

-	if(!empty($this->keywords))

-		$this->_out('/Keywords '.$this->_textstring($this->keywords));

-	if(!empty($this->creator))

-		$this->_out('/Creator '.$this->_textstring($this->creator));

+	if(!empty($this->title)) {

+			$this->_out('/Title '.$this->_textstring($this->title));

+	}

+	if(!empty($this->subject)) {

+			$this->_out('/Subject '.$this->_textstring($this->subject));

+	}

+	if(!empty($this->author)) {

+			$this->_out('/Author '.$this->_textstring($this->author));

+	}

+	if(!empty($this->keywords)) {

+			$this->_out('/Keywords '.$this->_textstring($this->keywords));

+	}

+	if(!empty($this->creator)) {

+			$this->_out('/Creator '.$this->_textstring($this->creator));

+	}

 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

 private function getAlign($v){

statistic/pdftable/lib/htmlparser.inc.php

Indentation +298 added lines, -298 removed lines

@@ -33,297 +33,297 @@ 
  */

 class HTMLParser {

 

-    /**

-     * Field iNodeType.

-     * May be one of the NODE_TYPE_* constants above.

-     */

-    var $iNodeType;

-

-    /**

-     * Field iNodeName.

-     * For elements, it's the name of the element.

-     */

-    var $iNodeName = "";

-

-    /**

-     * Field iNodeValue.

-     * For text nodes, it's the text.

-     */

-    var $iNodeValue = "";

-

-    /**

-     * Field iNodeAttributes.

-     * A string-indexed array containing attribute values

-     * of the current node. Indexes are always lowercase.

-     */

-    var $iNodeAttributes;

-

-    // The following fields should be 

-    // considered private:

-

-    var $iHtmlText;

-    var $iHtmlTextLength;

-    var $iHtmlTextIndex = 0;

-    var $iHtmlCurrentChar;

-

-    /**

-     * Constructor.

-     * Constructs an HTMLParser instance with

-     * the HTML text given.

-     */

-    function HTMLParser ($aHtmlText) {

-        $this->iHtmlText = $aHtmlText;

-        $this->iHtmlTextLength = strlen($aHtmlText);

-        $this->setTextIndex (0);

-    }

-

-    /**

-     * Method parse.

-     * Parses the next node. Returns false only if

-     * the end of the HTML text has been reached.

-     * Updates values of iNode* fields.

-     */

-    function parse() {

-        $text = trim($this->skipToElement());

-        if ($text != "") {

-            $this->iNodeType = NODE_TYPE_TEXT;

-            $this->iNodeName = "Text";

-            $this->iNodeValue = $text;

-            $this->iNodeAttributes = 0;

-            return true;

-        }

-        return $this->readTag();

-    }

-

-    function clearAttributes() {

-        $this->iNodeAttributes = array();

-    }

-

-    function readTag() {

-    	global $HTML_ATTRIBUTE_STAND_ALONE;

-        if ($this->iCurrentChar != "<") {

-            $this->iNodeType = NODE_TYPE_DONE;

-            return false;

-        }

-        $this->skipInTag (array("<"));

-        $this->clearAttributes();

-        $name = $this->skipToBlanksInTag();

-        $pos = strpos($name, "/");

-        if ($pos === 0) {

-            $this->iNodeType = NODE_TYPE_ENDELEMENT;

-            $this->iNodeName = substr ($name, 1);

-            $this->iNodeValue = "";

-        } 

-        else {

-            if (!$this->isValidTagIdentifier ($name)) {

-                $comment = false;

-                if ($name == "!--") {

-                    $rest = $this->skipToStringInTag ("-->");    

-                    if ($rest != "") {

-                        $this->iNodeType = NODE_TYPE_COMMENT;

-                        $this->iNodeName = "Comment";

-                        $this->iNodeValue = "<" . $name . $rest;

-                        $comment = true;

-                    }

-                }

-                if (!$comment) {

-                    $this->iNodeType = NODE_TYPE_TEXT;

-                    $this->iNodeName = "Text";

-                    $this->iNodeValue = "<" . $name;

-                }

-                return true;

-            }

-            else {

-                $this->iNodeType = NODE_TYPE_ELEMENT;

-                $this->iNodeValue = "";

-                $nameLength = strlen($name);

-                if ($nameLength > 0 && substr($name, $nameLength - 1, 1) == "/") {

-                	$this->iNodeName = substr($name, 0, $nameLength - 1);

-                }else {

-                    $this->iNodeName = $name;

-                }

-                $this->iNodeName = strtolower($this->iNodeName);

-            } 

-        }

-        while ($this->skipBlanksInTag()) {

-            $attrName = $this->skipToBlanksOrEqualsInTag();

-            if ($attrName != "") {

+	/**

+	 * Field iNodeType.

+	 * May be one of the NODE_TYPE_* constants above.

+	 */

+	var $iNodeType;

+

+	/**

+	 * Field iNodeName.

+	 * For elements, it's the name of the element.

+	 */

+	var $iNodeName = "";

+

+	/**

+	 * Field iNodeValue.

+	 * For text nodes, it's the text.

+	 */

+	var $iNodeValue = "";

+

+	/**

+	 * Field iNodeAttributes.

+	 * A string-indexed array containing attribute values

+	 * of the current node. Indexes are always lowercase.

+	 */

+	var $iNodeAttributes;

+

+	// The following fields should be 

+	// considered private:

+

+	var $iHtmlText;

+	var $iHtmlTextLength;

+	var $iHtmlTextIndex = 0;

+	var $iHtmlCurrentChar;

+

+	/**

+	 * Constructor.

+	 * Constructs an HTMLParser instance with

+	 * the HTML text given.

+	 */

+	function HTMLParser ($aHtmlText) {

+		$this->iHtmlText = $aHtmlText;

+		$this->iHtmlTextLength = strlen($aHtmlText);

+		$this->setTextIndex (0);

+	}

+

+	/**

+	 * Method parse.

+	 * Parses the next node. Returns false only if

+	 * the end of the HTML text has been reached.

+	 * Updates values of iNode* fields.

+	 */

+	function parse() {

+		$text = trim($this->skipToElement());

+		if ($text != "") {

+			$this->iNodeType = NODE_TYPE_TEXT;

+			$this->iNodeName = "Text";

+			$this->iNodeValue = $text;

+			$this->iNodeAttributes = 0;

+			return true;

+		}

+		return $this->readTag();

+	}

+

+	function clearAttributes() {

+		$this->iNodeAttributes = array();

+	}

+

+	function readTag() {

+		global $HTML_ATTRIBUTE_STAND_ALONE;

+		if ($this->iCurrentChar != "<") {

+			$this->iNodeType = NODE_TYPE_DONE;

+			return false;

+		}

+		$this->skipInTag (array("<"));

+		$this->clearAttributes();

+		$name = $this->skipToBlanksInTag();

+		$pos = strpos($name, "/");

+		if ($pos === 0) {

+			$this->iNodeType = NODE_TYPE_ENDELEMENT;

+			$this->iNodeName = substr ($name, 1);

+			$this->iNodeValue = "";

+		} 

+		else {

+			if (!$this->isValidTagIdentifier ($name)) {

+				$comment = false;

+				if ($name == "!--") {

+					$rest = $this->skipToStringInTag ("-->");    

+					if ($rest != "") {

+						$this->iNodeType = NODE_TYPE_COMMENT;

+						$this->iNodeName = "Comment";

+						$this->iNodeValue = "<" . $name . $rest;

+						$comment = true;

+					}

+				}

+				if (!$comment) {

+					$this->iNodeType = NODE_TYPE_TEXT;

+					$this->iNodeName = "Text";

+					$this->iNodeValue = "<" . $name;

+				}

+				return true;

+			}

+			else {

+				$this->iNodeType = NODE_TYPE_ELEMENT;

+				$this->iNodeValue = "";

+				$nameLength = strlen($name);

+				if ($nameLength > 0 && substr($name, $nameLength - 1, 1) == "/") {

+					$this->iNodeName = substr($name, 0, $nameLength - 1);

+				}else {

+					$this->iNodeName = $name;

+				}

+				$this->iNodeName = strtolower($this->iNodeName);

+			} 

+		}

+		while ($this->skipBlanksInTag()) {

+			$attrName = $this->skipToBlanksOrEqualsInTag();

+			if ($attrName != "") {

 				$attrName = strtolower($attrName);

 				if (array_search($attrName, $HTML_ATTRIBUTE_STAND_ALONE)!==false){

 					$this->iNodeAttributes[$attrName] = 1;

 				}else{

-	                $this->skipBlanksInTag();

-	                if ($this->iCurrentChar == "=") {

-	                    $this->skipEqualsInTag();

-	                    $this->skipBlanksInTag();

-	                    $value = $this->readValueInTag();

-	                    $this->iNodeAttributes[$attrName] = $value;

-	                }else {

-	                    $this->iNodeAttributes[$attrName] = "";

-	                }

+					$this->skipBlanksInTag();

+					if ($this->iCurrentChar == "=") {

+						$this->skipEqualsInTag();

+						$this->skipBlanksInTag();

+						$value = $this->readValueInTag();

+						$this->iNodeAttributes[$attrName] = $value;

+					}else {

+						$this->iNodeAttributes[$attrName] = "";

+					}

 				}

-            }

-        }

-        $this->skipEndOfTag();

-        return true;            

-    }

-

-    function isValidTagIdentifier ($name) {

-        return preg_match ("/[A-Za-z0-9]+/", $name);

-    }

+			}

+		}

+		$this->skipEndOfTag();

+		return true;            

+	}

+

+	function isValidTagIdentifier ($name) {

+		return preg_match ("/[A-Za-z0-9]+/", $name);

+	}

     

-    function skipBlanksInTag() {

-        return "" != ($this->skipInTag (array (" ", "\t", "\r", "\n" )));

-    }

-

-    function skipToBlanksOrEqualsInTag() {

-        return $this->skipToInTag (array (" ", "\t", "\r", "\n", "=" ));

-    }

-

-    function skipToBlanksInTag() {

-        return $this->skipToInTag (array (" ", "\t", "\r", "\n" ));

-    }

-

-    function skipEqualsInTag() {

-        return $this->skipInTag (array ( "=" ));

-    }

-

-    function readValueInTag() {

-        $ch = $this->iCurrentChar;

-        $value = "";

-        if ($ch == "\"") {

-            $this->skipInTag (array ( "\"" ));

-            $value = $this->skipToInTag (array ( "\"" ));

-            $this->skipInTag (array ( "\"" ));

-        }

-        else if ($ch == "'") {

-            $this->skipInTag (array ( "'" ));

-            $value = $this->skipToInTag (array ( "'" ));

-            $this->skipInTag (array ( "'" ));

-        }                

-        else {

-            $value = $this->skipToBlanksInTag();

-        }

-        return $value;

-    }

-

-    function setTextIndex ($index) {

-        $this->iHtmlTextIndex = $index;

-        if ($index >= $this->iHtmlTextLength) {

-            $this->iCurrentChar = -1;

-        }

-        else {

-            $this->iCurrentChar = $this->iHtmlText{$index};

-        }

-    }

-

-    function moveNext() {

-        if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

-            $this->setTextIndex ($this->iHtmlTextIndex + 1);

-            return true;

-        }

-        else {

-            return false;

-        }

-    }

-

-    function skipEndOfTag() {

-        $sb = "";

-        if (($ch = $this->iCurrentChar) !== -1) {

-            $match = ($ch == ">");

-            if (!$match) {

-                return $sb;

-            }

-            $sb .= $ch;

-            $this->moveNext();

-        }

-        return $sb;

-    }

-

-    function skipInTag ($chars) {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-            if ($ch == ">") {

-                return $sb;

-            } else {

-                if (array_search($ch,$chars) === false)

-                	return $sb;

-                $sb .= $ch;

-                $this->moveNext();

-            }

-        }

-        return $sb;

-    }

-

-    function skipToInTag ($chars) {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-        	if ($ch == '>' || array_search($ch,$chars) !== false)

-               	return $sb;

-            $sb .= $ch;

-            $this->moveNext();

-        }

-        return $sb;

-    }

-

-    function skipToElement() {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-            if ($ch == "<") {

-                return $sb;

-            }

-            $sb .= $ch;

-            $this->moveNext();

-        }

-        return $sb;             

-    }

-

-    /**

-     * Returns text between current position and $needle,

-     * inclusive, or "" if not found. The current index is moved to a point

-     * after the location of $needle, or not moved at all

-     * if nothing is found.

-     */

-    function skipToStringInTag ($needle) {

-        $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

-        if ($pos === false) {

-            return "";

-        }

-        $top = $pos + strlen($needle);

-        $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

-        $this->setTextIndex ($top);

-        return $retvalue;

-    }

+	function skipBlanksInTag() {

+		return "" != ($this->skipInTag (array (" ", "\t", "\r", "\n" )));

+	}

+

+	function skipToBlanksOrEqualsInTag() {

+		return $this->skipToInTag (array (" ", "\t", "\r", "\n", "=" ));

+	}

+

+	function skipToBlanksInTag() {

+		return $this->skipToInTag (array (" ", "\t", "\r", "\n" ));

+	}

+

+	function skipEqualsInTag() {

+		return $this->skipInTag (array ( "=" ));

+	}

+

+	function readValueInTag() {

+		$ch = $this->iCurrentChar;

+		$value = "";

+		if ($ch == "\"") {

+			$this->skipInTag (array ( "\"" ));

+			$value = $this->skipToInTag (array ( "\"" ));

+			$this->skipInTag (array ( "\"" ));

+		}

+		else if ($ch == "'") {

+			$this->skipInTag (array ( "'" ));

+			$value = $this->skipToInTag (array ( "'" ));

+			$this->skipInTag (array ( "'" ));

+		}                

+		else {

+			$value = $this->skipToBlanksInTag();

+		}

+		return $value;

+	}

+

+	function setTextIndex ($index) {

+		$this->iHtmlTextIndex = $index;

+		if ($index >= $this->iHtmlTextLength) {

+			$this->iCurrentChar = -1;

+		}

+		else {

+			$this->iCurrentChar = $this->iHtmlText{$index};

+		}

+	}

+

+	function moveNext() {

+		if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

+			$this->setTextIndex ($this->iHtmlTextIndex + 1);

+			return true;

+		}

+		else {

+			return false;

+		}

+	}

+

+	function skipEndOfTag() {

+		$sb = "";

+		if (($ch = $this->iCurrentChar) !== -1) {

+			$match = ($ch == ">");

+			if (!$match) {

+				return $sb;

+			}

+			$sb .= $ch;

+			$this->moveNext();

+		}

+		return $sb;

+	}

+

+	function skipInTag ($chars) {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == ">") {

+				return $sb;

+			} else {

+				if (array_search($ch,$chars) === false)

+					return $sb;

+				$sb .= $ch;

+				$this->moveNext();

+			}

+		}

+		return $sb;

+	}

+

+	function skipToInTag ($chars) {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == '>' || array_search($ch,$chars) !== false)

+			   	return $sb;

+			$sb .= $ch;

+			$this->moveNext();

+		}

+		return $sb;

+	}

+

+	function skipToElement() {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == "<") {

+				return $sb;

+			}

+			$sb .= $ch;

+			$this->moveNext();

+		}

+		return $sb;             

+	}

+

+	/**

+	 * Returns text between current position and $needle,

+	 * inclusive, or "" if not found. The current index is moved to a point

+	 * after the location of $needle, or not moved at all

+	 * if nothing is found.

+	 */

+	function skipToStringInTag ($needle) {

+		$pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

+		if ($pos === false) {

+			return "";

+		}

+		$top = $pos + strlen($needle);

+		$retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

+		$this->setTextIndex ($top);

+		return $retvalue;

+	}

 }

 

 class HTMLFileParser extends HTMLParser {

 	function HTMLFileParser($fileName){

-	    $fp = fopen ($fileName, "r");

-	    $content = "";

-	    while (true) {

-	        $data = fread ($fp, 8192);

-	        if (strlen($data) == 0) {

-	            break;

-	        }

-	        $content .= $data;

-	    }

-	    fclose ($fp);

+		$fp = fopen ($fileName, "r");

+		$content = "";

+		while (true) {

+			$data = fread ($fp, 8192);

+			if (strlen($data) == 0) {

+				break;

+			}

+			$content .= $data;

+		}

+		fclose ($fp);

 		$this->HTMLParser($content);

 	}

 }

 

 class HTMLURLParser extends HTMLParser {

 	function HTMLURLParser($url){

-	    $fp = fopen ($url, "r");

-	    $content = "";

-	    while (true) {

-	        $data = fread ($fp, 8192);

-	        if (strlen($data) == 0) {

-	            break;

-	        }

-	        $content .= $data;

-	    }

-	    fclose ($fp);

+		$fp = fopen ($url, "r");

+		$content = "";

+		while (true) {

+			$data = fread ($fp, 8192);

+			if (strlen($data) == 0) {

+				break;

+			}

+			$content .= $data;

+		}

+		fclose ($fp);

 		$this->HTMLParser(file_get_contents($content));

 	}

 }

@@ -341,29 +341,29 @@ 
 	 * @desc Tao mot tree node cac phan tu cua HTML

 	 */

 	function TreeHTML($parser, $file=true){

-	    $i = 0;

-	    if ($file){

-		    while ($parser->parse())

-		    	if (strtolower($parser->iNodeName)=='body') break;

-	    }

-	    while ($parser->parse()){

-	    	if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName)=='body' && $file) break;

-

-	    	$this->type[$i] = $parser->iNodeType;

-	    	$this->name[$i] = $parser->iNodeName;

-	    	if ($parser->iNodeType == NODE_TYPE_TEXT)

-	    		$this->value[$i] = $parser->iNodeValue;

-	    	if ($parser->iNodeType == NODE_TYPE_ELEMENT){

-	    		$this->attribute[$i] = $parser->iNodeAttributes;

-	    		if (isset($parser->iNodeAttributes['name'])){

-	    			$this->field[$i] = trim($parser->iNodeAttributes['name'],"\"' ");

-	    		}

-	    		if (   ($file && $parser->iNodeName == 'input' && isset($this->attribute[$i]['type']) && $this->attribute[$i]['type']=='text' && !isset($this->attribute[$i]['onkeydown']))

-	    			|| ($file && $parser->iNodeName == 'textarea'))

-	    			$this->attribute[$i]['onkeyup'] = 'initTyper(this)';

-	    	}

-	    	$i++;

-	    }

+		$i = 0;

+		if ($file){

+			while ($parser->parse())

+				if (strtolower($parser->iNodeName)=='body') break;

+		}

+		while ($parser->parse()){

+			if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName)=='body' && $file) break;

+

+			$this->type[$i] = $parser->iNodeType;

+			$this->name[$i] = $parser->iNodeName;

+			if ($parser->iNodeType == NODE_TYPE_TEXT)

+				$this->value[$i] = $parser->iNodeValue;

+			if ($parser->iNodeType == NODE_TYPE_ELEMENT){

+				$this->attribute[$i] = $parser->iNodeAttributes;

+				if (isset($parser->iNodeAttributes['name'])){

+					$this->field[$i] = trim($parser->iNodeAttributes['name'],"\"' ");

+				}

+				if (   ($file && $parser->iNodeName == 'input' && isset($this->attribute[$i]['type']) && $this->attribute[$i]['type']=='text' && !isset($this->attribute[$i]['onkeydown']))

+					|| ($file && $parser->iNodeName == 'textarea'))

+					$this->attribute[$i]['onkeyup'] = 'initTyper(this)';

+			}

+			$i++;

+		}

 	}

 	

 	/**

Switch Indentation +8 added lines, -8 removed lines

@@ -513,14 +513,14 @@
 		foreach ($this->name as $i => $name){

 			if ($name == 'input' && isset($this->attribute[$i]['type'])){

 				switch($this->attribute[$i]['type']){

-				case 'text':

-				 	$this->attribute[$i]['readonly'] = 'true';

-				 	$this->attribute[$i]['style'] = 'border: 1 dotted #999999';

-				 	break;

-				case 'select':

-				case 'checkbox':

-					$this->attribute[$i]['disabled'] = 1;

-					break;

+					case 'text':

+				 		$this->attribute[$i]['readonly'] = 'true';

+				 		$this->attribute[$i]['style'] = 'border: 1 dotted #999999';

+				 		break;

+					case 'select':

+					case 'checkbox':

+						$this->attribute[$i]['disabled'] = 1;

+						break;

 				}

 			}elseif ($name == 'textarea'){

 			 	$this->attribute[$i]['readonly'] = 'true';

Spacing +87 added lines, -87 removed lines

@@ -1,7 +1,7 @@ 
 <?php

 

 global $HTML_ATTRIBUTE_STAND_ALONE;

-$HTML_ATTRIBUTE_STAND_ALONE = array('checked','compact','declare','defer','disabled','ismap','multiple','nohref','noresize','noshade','nowrap','readonly','selected');

+$HTML_ATTRIBUTE_STAND_ALONE = array('checked', 'compact', 'declare', 'defer', 'disabled', 'ismap', 'multiple', 'nohref', 'noresize', 'noshade', 'nowrap', 'readonly', 'selected');

 

 /*

  * Copyright (c) 2003 Jose Solorzano.  All rights reserved.

@@ -13,12 +13,12 @@ 
  * - Leo West (performance improvements)

  */

 

-define ("NODE_TYPE_START",0);

-define ("NODE_TYPE_ELEMENT",1);

-define ("NODE_TYPE_ENDELEMENT",2);

-define ("NODE_TYPE_TEXT",3);

-define ("NODE_TYPE_COMMENT",4);

-define ("NODE_TYPE_DONE",5);

+define("NODE_TYPE_START", 0);

+define("NODE_TYPE_ELEMENT", 1);

+define("NODE_TYPE_ENDELEMENT", 2);

+define("NODE_TYPE_TEXT", 3);

+define("NODE_TYPE_COMMENT", 4);

+define("NODE_TYPE_DONE", 5);

 

 /**

  * Class HTMLParser.

@@ -71,10 +71,10 @@ 
      * Constructs an HTMLParser instance with

      * the HTML text given.

      */

-    function HTMLParser ($aHtmlText) {

+    function HTMLParser($aHtmlText) {

         $this->iHtmlText = $aHtmlText;

         $this->iHtmlTextLength = strlen($aHtmlText);

-        $this->setTextIndex (0);

+        $this->setTextIndex(0);

     }

 

     /**

@@ -105,31 +105,31 @@ 
             $this->iNodeType = NODE_TYPE_DONE;

             return false;

         }

-        $this->skipInTag (array("<"));

+        $this->skipInTag(array("<"));

         $this->clearAttributes();

         $name = $this->skipToBlanksInTag();

         $pos = strpos($name, "/");

         if ($pos === 0) {

             $this->iNodeType = NODE_TYPE_ENDELEMENT;

-            $this->iNodeName = substr ($name, 1);

+            $this->iNodeName = substr($name, 1);

             $this->iNodeValue = "";

         } 

         else {

-            if (!$this->isValidTagIdentifier ($name)) {

+            if (!$this->isValidTagIdentifier($name)) {

                 $comment = false;

                 if ($name == "!--") {

-                    $rest = $this->skipToStringInTag ("-->");    

+                    $rest = $this->skipToStringInTag("-->");    

                     if ($rest != "") {

                         $this->iNodeType = NODE_TYPE_COMMENT;

                         $this->iNodeName = "Comment";

-                        $this->iNodeValue = "<" . $name . $rest;

+                        $this->iNodeValue = "<".$name.$rest;

                         $comment = true;

                     }

                 }

                 if (!$comment) {

                     $this->iNodeType = NODE_TYPE_TEXT;

                     $this->iNodeName = "Text";

-                    $this->iNodeValue = "<" . $name;

+                    $this->iNodeValue = "<".$name;

                 }

                 return true;

             }

@@ -149,9 +149,9 @@ 
             $attrName = $this->skipToBlanksOrEqualsInTag();

             if ($attrName != "") {

 				$attrName = strtolower($attrName);

-				if (array_search($attrName, $HTML_ATTRIBUTE_STAND_ALONE)!==false){

+				if (array_search($attrName, $HTML_ATTRIBUTE_STAND_ALONE) !== false) {

 					$this->iNodeAttributes[$attrName] = 1;

-				}else{

+				}else {

 	                $this->skipBlanksInTag();

 	                if ($this->iCurrentChar == "=") {

 	                    $this->skipEqualsInTag();

@@ -168,38 +168,38 @@ 
         return true;            

     }

 

-    function isValidTagIdentifier ($name) {

-        return preg_match ("/[A-Za-z0-9]+/", $name);

+    function isValidTagIdentifier($name) {

+        return preg_match("/[A-Za-z0-9]+/", $name);

     }

     

     function skipBlanksInTag() {

-        return "" != ($this->skipInTag (array (" ", "\t", "\r", "\n" )));

+        return "" != ($this->skipInTag(array(" ", "\t", "\r", "\n")));

     }

 

     function skipToBlanksOrEqualsInTag() {

-        return $this->skipToInTag (array (" ", "\t", "\r", "\n", "=" ));

+        return $this->skipToInTag(array(" ", "\t", "\r", "\n", "="));

     }

 

     function skipToBlanksInTag() {

-        return $this->skipToInTag (array (" ", "\t", "\r", "\n" ));

+        return $this->skipToInTag(array(" ", "\t", "\r", "\n"));

     }

 

     function skipEqualsInTag() {

-        return $this->skipInTag (array ( "=" ));

+        return $this->skipInTag(array("="));

     }

 

     function readValueInTag() {

         $ch = $this->iCurrentChar;

         $value = "";

         if ($ch == "\"") {

-            $this->skipInTag (array ( "\"" ));

-            $value = $this->skipToInTag (array ( "\"" ));

-            $this->skipInTag (array ( "\"" ));

+            $this->skipInTag(array("\""));

+            $value = $this->skipToInTag(array("\""));

+            $this->skipInTag(array("\""));

         }

         else if ($ch == "'") {

-            $this->skipInTag (array ( "'" ));

-            $value = $this->skipToInTag (array ( "'" ));

-            $this->skipInTag (array ( "'" ));

+            $this->skipInTag(array("'"));

+            $value = $this->skipToInTag(array("'"));

+            $this->skipInTag(array("'"));

         }                

         else {

             $value = $this->skipToBlanksInTag();

@@ -207,7 +207,7 @@ 
         return $value;

     }

 

-    function setTextIndex ($index) {

+    function setTextIndex($index) {

         $this->iHtmlTextIndex = $index;

         if ($index >= $this->iHtmlTextLength) {

             $this->iCurrentChar = -1;

@@ -219,7 +219,7 @@ 
 

     function moveNext() {

         if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

-            $this->setTextIndex ($this->iHtmlTextIndex + 1);

+            $this->setTextIndex($this->iHtmlTextIndex + 1);

             return true;

         }

         else {

@@ -240,13 +240,13 @@ 
         return $sb;

     }

 

-    function skipInTag ($chars) {

+    function skipInTag($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

             if ($ch == ">") {

                 return $sb;

-            } else {

-                if (array_search($ch,$chars) === false)

+            }else {

+                if (array_search($ch, $chars) === false)

                 	return $sb;

                 $sb .= $ch;

                 $this->moveNext();

@@ -255,10 +255,10 @@ 
         return $sb;

     }

 

-    function skipToInTag ($chars) {

+    function skipToInTag($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

-        	if ($ch == '>' || array_search($ch,$chars) !== false)

+        	if ($ch == '>' || array_search($ch, $chars) !== false)

                	return $sb;

             $sb .= $ch;

             $this->moveNext();

@@ -284,81 +284,81 @@ 
      * after the location of $needle, or not moved at all

      * if nothing is found.

      */

-    function skipToStringInTag ($needle) {

-        $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

+    function skipToStringInTag($needle) {

+        $pos = strpos($this->iHtmlText, $needle, $this->iHtmlTextIndex);

         if ($pos === false) {

             return "";

         }

         $top = $pos + strlen($needle);

-        $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

-        $this->setTextIndex ($top);

+        $retvalue = substr($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

+        $this->setTextIndex($top);

         return $retvalue;

     }

 }

 

 class HTMLFileParser extends HTMLParser {

-	function HTMLFileParser($fileName){

-	    $fp = fopen ($fileName, "r");

+	function HTMLFileParser($fileName) {

+	    $fp = fopen($fileName, "r");

 	    $content = "";

 	    while (true) {

-	        $data = fread ($fp, 8192);

+	        $data = fread($fp, 8192);

 	        if (strlen($data) == 0) {

 	            break;

 	        }

 	        $content .= $data;

 	    }

-	    fclose ($fp);

+	    fclose($fp);

 		$this->HTMLParser($content);

 	}

 }

 

 class HTMLURLParser extends HTMLParser {

-	function HTMLURLParser($url){

-	    $fp = fopen ($url, "r");

+	function HTMLURLParser($url) {

+	    $fp = fopen($url, "r");

 	    $content = "";

 	    while (true) {

-	        $data = fread ($fp, 8192);

+	        $data = fread($fp, 8192);

 	        if (strlen($data) == 0) {

 	            break;

 	        }

 	        $content .= $data;

 	    }

-	    fclose ($fp);

+	    fclose($fp);

 		$this->HTMLParser(file_get_contents($content));

 	}

 }

 

-class TreeHTML{

+class TreeHTML {

 	var $type = array();

 	var $name = array();

 	var $value = array();

 	var $attribute = array();

 	var $field = array();

-	var $addText='';

+	var $addText = '';

 

 	/**

 	 * @return array

 	 * @desc Tao mot tree node cac phan tu cua HTML

 	 */

-	function TreeHTML($parser, $file=true){

+	function TreeHTML($parser, $file = true) {

 	    $i = 0;

-	    if ($file){

+	    if ($file) {

 		    while ($parser->parse())

-		    	if (strtolower($parser->iNodeName)=='body') break;

+		    	if (strtolower($parser->iNodeName) == 'body') break;

 	    }

-	    while ($parser->parse()){

-	    	if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName)=='body' && $file) break;

+	    while ($parser->parse()) {

+	    	if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName) == 'body' && $file) break;

 

 	    	$this->type[$i] = $parser->iNodeType;

 	    	$this->name[$i] = $parser->iNodeName;

 	    	if ($parser->iNodeType == NODE_TYPE_TEXT)

 	    		$this->value[$i] = $parser->iNodeValue;

-	    	if ($parser->iNodeType == NODE_TYPE_ELEMENT){

+	    	if ($parser->iNodeType == NODE_TYPE_ELEMENT) {

 	    		$this->attribute[$i] = $parser->iNodeAttributes;

-	    		if (isset($parser->iNodeAttributes['name'])){

-	    			$this->field[$i] = trim($parser->iNodeAttributes['name'],"\"' ");

+	    		if (isset($parser->iNodeAttributes['name'])) {

+	    			$this->field[$i] = trim($parser->iNodeAttributes['name'], "\"' ");

 	    		}

-	    		if (   ($file && $parser->iNodeName == 'input' && isset($this->attribute[$i]['type']) && $this->attribute[$i]['type']=='text' && !isset($this->attribute[$i]['onkeydown']))

+	    		if (($file && $parser->iNodeName == 'input' && isset($this->attribute[$i]['type']) && $this->attribute[$i]['type'] == 'text' && !isset($this->attribute[$i]['onkeydown']))

 	    			|| ($file && $parser->iNodeName == 'textarea'))

 	    			$this->attribute[$i]['onkeyup'] = 'initTyper(this)';

 	    	}

@@ -369,7 +369,7 @@ 
 	/**

 	 * @desc Them hoac sua field co ten $name mot thuoc tinh $attr

 	 */

-	function set($name,$attr, $value){

+	function set($name, $attr, $value) {

 		$index = array_search($name, $this->field);

 		if (!$index) return;

 		$this->attribute[$index][$attr] = $value;

@@ -378,7 +378,7 @@ 
 	/**

 	 * @desc Tra ve thuoc tinh $attr cua field $name

 	 */

-	function get($name,$attr){

+	function get($name, $attr) {

 		$index = array_search($name, $this->field);

 		if ($index && isset($this->attribute[$index][$attr]))

 			return $this->attribute[$index][$attr];

@@ -388,7 +388,7 @@ 
 	/**

 	 * @desc Tra ve ten cua tag HTML ung voi field $name

 	 */

-	function getTag($name){

+	function getTag($name) {

 		$index = array_search($name, $this->field);

 		//if (!isset($this->name[$index])) {debug($name);debug($index);}

 		return $this->name[$index];

@@ -397,9 +397,9 @@ 
 	/**

 	 * @desc Tra ve cac thuoc tinh gom tabindex, size, maxlength

 	 */

-	function getAll($name){

+	function getAll($name) {

 		$index = array_search($name, $this->field);

-		if ($index){

+		if ($index) {

 			$t = '';

 			if (isset($this->attribute[$index]['tabindex']))

 				$t .= ' tabindex='.$this->attribute[$index]['tabindex'];

@@ -415,7 +415,7 @@ 
 	/**

 	 * @desc Thay doi node ten $name thanh text voi noi dung $text

 	 */

-	function replace($name,$text){

+	function replace($name, $text) {

 		$index = array_search($name, $this->field);

 		if (!$index) return;

 		$this->removeIndex($index);

@@ -426,17 +426,17 @@ 
 	/**

 	 * @desc Thay doi node ten $name thanh text voi noi dung $text

 	 */

-	function remove($name){

+	function remove($name) {

 		$index = array_search($name, $this->field);

 		if (!$index) return;

-		if (!isset($this->name[$index])) return;//echo "Remove: $name <br>";

+		if (!isset($this->name[$index])) return; //echo "Remove: $name <br>";

 		$rname = $this->name[$index];

 		$len = count($this->name);

-		for ($end=$index+1;$end<$len;$end++){

+		for ($end = $index + 1; $end < $len; $end++) {

 			if (isset($this->name[$end]) && $this->name[$end] == $rname) break;

 		}

-		if (isset($this->type[$end]) && $this->type[$end]==NODE_TYPE_ENDELEMENT){

-			for ($i=$index;$i<=$end;$i++) $this->removeIndex($i);

+		if (isset($this->type[$end]) && $this->type[$end] == NODE_TYPE_ENDELEMENT) {

+			for ($i = $index; $i <= $end; $i++) $this->removeIndex($i);

 		}else

 			$this->removeIndex($index);

 	}

@@ -444,8 +444,8 @@ 
 	/**

 	 * @desc Private: Xoa 1 object trong tree

 	 */

-	function removeIndex($index){

-		$this->type[$index]=-1;

+	function removeIndex($index) {

+		$this->type[$index] = -1;

 		unset($this->field[$index]);

 		unset($this->name[$index]);

 		unset($this->value[$index]);

@@ -457,7 +457,7 @@ 
 	 * @desc Create a string HTML from a tree<br>

 	 * An Item have format ($iNodeType, $iNodeName, $iNodeValue, $iNodeAttributes)

 	 */

-	function toHTML(){

+	function toHTML() {

 		global $HTML_ATTRIBUTE_STAND_ALONE;

 		$result = '';

 		$type = &$this->type;

@@ -466,26 +466,26 @@ 
 		$attr = &$this->attribute;

 		

 		$len = count($type);

-		for ($i=0; $i<$len;$i++){

+		for ($i = 0; $i < $len; $i++) {

 			$str = '';

-			switch($type[$i]){

+			switch ($type[$i]) {

 				case NODE_TYPE_ELEMENT:

-					if ($name[$i] != 'textarea'){

+					if ($name[$i] != 'textarea') {

 						$str .= '<'.$name[$i];

-						if (isset($attr[$i])) foreach($attr[$i] as $key => $value){

-							if (array_search($value,$HTML_ATTRIBUTE_STAND_ALONE)!==false)

+						if (isset($attr[$i])) foreach ($attr[$i] as $key => $value) {

+							if (array_search($value, $HTML_ATTRIBUTE_STAND_ALONE) !== false)

 								$str .= " $key";

 							else

 								$str .= " $key=\"$value\"";

 						}

 						$str .= '>';

-					}else{//is tag ATEXTAREA

+					}else {//is tag ATEXTAREA

 						$content = '';

 						$str .= '<'.$name[$i];

-						if (isset($attr[$i])) foreach($attr[$i] as $key => $value){

+						if (isset($attr[$i])) foreach ($attr[$i] as $key => $value) {

 							if ($key == 'value')

 								$content = $value;

-							elseif (array_search($value,$HTML_ATTRIBUTE_STAND_ALONE)!==false)

+							elseif (array_search($value, $HTML_ATTRIBUTE_STAND_ALONE) !== false)

 								$str .= " $key";

 							else

 								$str .= " $key=\"$value\"";

@@ -509,10 +509,10 @@ 
 	/**

 	 * @desc Set all input text to readonly

 	 */

-	function setReadonlyAll(){

-		foreach ($this->name as $i => $name){

-			if ($name == 'input' && isset($this->attribute[$i]['type'])){

-				switch($this->attribute[$i]['type']){

+	function setReadonlyAll() {

+		foreach ($this->name as $i => $name) {

+			if ($name == 'input' && isset($this->attribute[$i]['type'])) {

+				switch ($this->attribute[$i]['type']) {

 				case 'text':

 				 	$this->attribute[$i]['readonly'] = 'true';

 				 	$this->attribute[$i]['style'] = 'border: 1 dotted #999999';

@@ -522,7 +522,7 @@ 
 					$this->attribute[$i]['disabled'] = 1;

 					break;

 				}

-			}elseif ($name == 'textarea'){

+			}elseif ($name == 'textarea') {

 			 	$this->attribute[$i]['readonly'] = 'true';

 			 	$this->attribute[$i]['style'] = 'border: 1 dotted #999999';

 			}

@@ -532,7 +532,7 @@ 
 	/**

 	 * @desc Set an input text to readonly

 	 */

-	function setReadonly($name){

+	function setReadonly($name) {

 		$index = array_search($name, $this->field);

 		if (!$index) return;

 		$this->attribute[$index]['readonly'] = true;

Braces +78 added lines, -53 removed lines

@@ -113,8 +113,7 @@ 
             $this->iNodeType = NODE_TYPE_ENDELEMENT;

             $this->iNodeName = substr ($name, 1);

             $this->iNodeValue = "";

-        } 

-        else {

+        } else {

             if (!$this->isValidTagIdentifier ($name)) {

                 $comment = false;

                 if ($name == "!--") {

@@ -132,14 +131,13 @@ 
                     $this->iNodeValue = "<" . $name;

                 }

                 return true;

-            }

-            else {

+            } else {

                 $this->iNodeType = NODE_TYPE_ELEMENT;

                 $this->iNodeValue = "";

                 $nameLength = strlen($name);

                 if ($nameLength > 0 && substr($name, $nameLength - 1, 1) == "/") {

                 	$this->iNodeName = substr($name, 0, $nameLength - 1);

-                }else {

+                } else {

                     $this->iNodeName = $name;

                 }

                 $this->iNodeName = strtolower($this->iNodeName);

@@ -151,14 +149,14 @@ 
 				$attrName = strtolower($attrName);

 				if (array_search($attrName, $HTML_ATTRIBUTE_STAND_ALONE)!==false){

 					$this->iNodeAttributes[$attrName] = 1;

-				}else{

+				} else{

 	                $this->skipBlanksInTag();

 	                if ($this->iCurrentChar == "=") {

 	                    $this->skipEqualsInTag();

 	                    $this->skipBlanksInTag();

 	                    $value = $this->readValueInTag();

 	                    $this->iNodeAttributes[$attrName] = $value;

-	                }else {

+	                } else {

 	                    $this->iNodeAttributes[$attrName] = "";

 	                }

 				}

@@ -195,13 +193,11 @@ 
             $this->skipInTag (array ( "\"" ));

             $value = $this->skipToInTag (array ( "\"" ));

             $this->skipInTag (array ( "\"" ));

-        }

-        else if ($ch == "'") {

+        } else if ($ch == "'") {

             $this->skipInTag (array ( "'" ));

             $value = $this->skipToInTag (array ( "'" ));

             $this->skipInTag (array ( "'" ));

-        }                

-        else {

+        } else {

             $value = $this->skipToBlanksInTag();

         }

         return $value;

@@ -211,8 +207,7 @@ 
         $this->iHtmlTextIndex = $index;

         if ($index >= $this->iHtmlTextLength) {

             $this->iCurrentChar = -1;

-        }

-        else {

+        } else {

             $this->iCurrentChar = $this->iHtmlText{$index};

         }

     }

@@ -221,8 +216,7 @@ 
         if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

             $this->setTextIndex ($this->iHtmlTextIndex + 1);

             return true;

-        }

-        else {

+        } else {

             return false;

         }

     }

@@ -246,8 +240,9 @@ 
             if ($ch == ">") {

                 return $sb;

             } else {

-                if (array_search($ch,$chars) === false)

-                	return $sb;

+                if (array_search($ch,$chars) === false) {

+                                	return $sb;

+                }

                 $sb .= $ch;

                 $this->moveNext();

             }

@@ -258,8 +253,9 @@ 
     function skipToInTag ($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

-        	if ($ch == '>' || array_search($ch,$chars) !== false)

-               	return $sb;

+        	if ($ch == '>' || array_search($ch,$chars) !== false) {

+        	               	return $sb;

+        	}

             $sb .= $ch;

             $this->moveNext();

         }

@@ -343,24 +339,29 @@ 
 	function TreeHTML($parser, $file=true){

 	    $i = 0;

 	    if ($file){

-		    while ($parser->parse())

-		    	if (strtolower($parser->iNodeName)=='body') break;

+		    while ($parser->parse()) {

+		    		    	if (strtolower($parser->iNodeName)=='body') break;

+		    }

 	    }

 	    while ($parser->parse()){

-	    	if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName)=='body' && $file) break;

+	    	if ($parser->iNodeType == NODE_TYPE_ENDELEMENT && strtolower($parser->iNodeName)=='body' && $file) {

+	    		break;

+	    	}

 

 	    	$this->type[$i] = $parser->iNodeType;

 	    	$this->name[$i] = $parser->iNodeName;

-	    	if ($parser->iNodeType == NODE_TYPE_TEXT)

-	    		$this->value[$i] = $parser->iNodeValue;

+	    	if ($parser->iNodeType == NODE_TYPE_TEXT) {

+	    		    		$this->value[$i] = $parser->iNodeValue;

+	    	}

 	    	if ($parser->iNodeType == NODE_TYPE_ELEMENT){

 	    		$this->attribute[$i] = $parser->iNodeAttributes;

 	    		if (isset($parser->iNodeAttributes['name'])){

 	    			$this->field[$i] = trim($parser->iNodeAttributes['name'],"\"' ");

 	    		}

 	    		if (   ($file && $parser->iNodeName == 'input' && isset($this->attribute[$i]['type']) && $this->attribute[$i]['type']=='text' && !isset($this->attribute[$i]['onkeydown']))

-	    			|| ($file && $parser->iNodeName == 'textarea'))

-	    			$this->attribute[$i]['onkeyup'] = 'initTyper(this)';

+	    			|| ($file && $parser->iNodeName == 'textarea')) {

+	    			    			$this->attribute[$i]['onkeyup'] = 'initTyper(this)';

+	    		}

 	    	}

 	    	$i++;

 	    }

@@ -371,7 +372,9 @@ 
 	 */

 	function set($name,$attr, $value){

 		$index = array_search($name, $this->field);

-		if (!$index) return;

+		if (!$index) {

+			return;

+		}

 		$this->attribute[$index][$attr] = $value;

 	}

 	

@@ -380,8 +383,9 @@ 
 	 */

 	function get($name,$attr){

 		$index = array_search($name, $this->field);

-		if ($index && isset($this->attribute[$index][$attr]))

-			return $this->attribute[$index][$attr];

+		if ($index && isset($this->attribute[$index][$attr])) {

+					return $this->attribute[$index][$attr];

+		}

 		return '';

 	}

 	

@@ -401,12 +405,15 @@ 
 		$index = array_search($name, $this->field);

 		if ($index){

 			$t = '';

-			if (isset($this->attribute[$index]['tabindex']))

-				$t .= ' tabindex='.$this->attribute[$index]['tabindex'];

-			if (isset($this->attribute[$index]['size']))

-				$t .= ' size='.$this->attribute[$index]['size'];

-			if (isset($this->attribute[$index]['maxlength']))

-				$t .= ' maxlength='.$this->attribute[$index]['maxlength'];

+			if (isset($this->attribute[$index]['tabindex'])) {

+							$t .= ' tabindex='.$this->attribute[$index]['tabindex'];

+			}

+			if (isset($this->attribute[$index]['size'])) {

+							$t .= ' size='.$this->attribute[$index]['size'];

+			}

+			if (isset($this->attribute[$index]['maxlength'])) {

+							$t .= ' maxlength='.$this->attribute[$index]['maxlength'];

+			}

 			return $t;

 		}

 		return '';

@@ -417,7 +424,9 @@ 
 	 */

 	function replace($name,$text){

 		$index = array_search($name, $this->field);

-		if (!$index) return;

+		if (!$index) {

+			return;

+		}

 		$this->removeIndex($index);

 		$this->type[$index] = NODE_TYPE_TEXT;

 		$this->value[$index] = $text;

@@ -428,17 +437,27 @@ 
 	 */

 	function remove($name){

 		$index = array_search($name, $this->field);

-		if (!$index) return;

-		if (!isset($this->name[$index])) return;//echo "Remove: $name <br>";

+		if (!$index) {

+			return;

+		}

+		if (!isset($this->name[$index])) {

+			return;

+		}

+		//echo "Remove: $name <br>";

 		$rname = $this->name[$index];

 		$len = count($this->name);

 		for ($end=$index+1;$end<$len;$end++){

-			if (isset($this->name[$end]) && $this->name[$end] == $rname) break;

+			if (isset($this->name[$end]) && $this->name[$end] == $rname) {

+				break;

+			}

 		}

 		if (isset($this->type[$end]) && $this->type[$end]==NODE_TYPE_ENDELEMENT){

-			for ($i=$index;$i<=$end;$i++) $this->removeIndex($i);

-		}else

-			$this->removeIndex($index);

+			for ($i=$index;$i<=$end;$i++) {

+				$this->removeIndex($i);

+			}

+		} else {

+					$this->removeIndex($index);

+		}

 	}

 	

 	/**

@@ -472,23 +491,27 @@ 
 				case NODE_TYPE_ELEMENT:

 					if ($name[$i] != 'textarea'){

 						$str .= '<'.$name[$i];

-						if (isset($attr[$i])) foreach($attr[$i] as $key => $value){

+						if (isset($attr[$i])) {

+							foreach($attr[$i] as $key => $value){

 							if (array_search($value,$HTML_ATTRIBUTE_STAND_ALONE)!==false)

 								$str .= " $key";

-							else

-								$str .= " $key=\"$value\"";

+						} else {

+															$str .= " $key=\"$value\"";

+							}

 						}

 						$str .= '>';

-					}else{//is tag ATEXTAREA

+					} else{//is tag ATEXTAREA

 						$content = '';

 						$str .= '<'.$name[$i];

-						if (isset($attr[$i])) foreach($attr[$i] as $key => $value){

+						if (isset($attr[$i])) {

+							foreach($attr[$i] as $key => $value){

 							if ($key == 'value')

 								$content = $value;

-							elseif (array_search($value,$HTML_ATTRIBUTE_STAND_ALONE)!==false)

-								$str .= " $key";

-							else

-								$str .= " $key=\"$value\"";

+						} elseif (array_search($value,$HTML_ATTRIBUTE_STAND_ALONE)!==false) {

+															$str .= " $key";

+							} else {

+															$str .= " $key=\"$value\"";

+							}

 						}

 						$str .= '>'.$content;

 					}

@@ -522,7 +545,7 @@ 
 					$this->attribute[$i]['disabled'] = 1;

 					break;

 				}

-			}elseif ($name == 'textarea'){

+			} elseif ($name == 'textarea'){

 			 	$this->attribute[$i]['readonly'] = 'true';

 			 	$this->attribute[$i]['style'] = 'border: 1 dotted #999999';

 			}

@@ -534,7 +557,9 @@ 
 	 */

 	function setReadonly($name){

 		$index = array_search($name, $this->field);

-		if (!$index) return;

+		if (!$index) {

+			return;

+		}

 		$this->attribute[$index]['readonly'] = true;

 		$this->attribute[$index]['style'] = 'border: 1 dotted #999999';

 	}

statistic/pdftable/lib/color.inc.php

Spacing +31 added lines, -31 removed lines

@@ -5,17 +5,17 @@ 
  * Author: vietcom (vncommando at yahoo dot com)

  * Version: 1.0

  */

-class Color{

+class Color {

 	/**

 	 * @desc Use only for function HSL2RGB()

 	 */

-	function _HSL_2_RGB( $v1, $v2, $vH ){

-		if ( $vH < 0 ) $vH += 1;

-		if ( $vH > 1 ) $vH -= 1;

-		if ( ( 6 * $vH ) < 1 ) return ( $v1 + ( $v2 - $v1 ) * 6 * $vH );

-		if ( ( 2 * $vH ) < 1 ) return ( $v2 );

-		if ( ( 3 * $vH ) < 2 ) return ( $v1 + ( $v2 - $v1 ) * ( ( 2 / 3 ) - $vH ) * 6 );

-		return ( $v1 );

+	function _HSL_2_RGB($v1, $v2, $vH) {

+		if ($vH < 0) $vH += 1;

+		if ($vH > 1) $vH -= 1;

+		if ((6 * $vH) < 1) return ($v1 + ($v2 - $v1) * 6 * $vH);

+		if ((2 * $vH) < 1) return ($v2);

+		if ((3 * $vH) < 2) return ($v1 + ($v2 - $v1) * ((2 / 3) - $vH) * 6);

+		return ($v1);

 	}

 	/**

 	 * @desc Convert HSL to RGB

@@ -23,35 +23,35 @@ 
 	 * RGB results = From 0 to 255

 	 * Code from http://www.easyrgb.com/math.php?MATH=M19#text19

 	 */

-	function HSL2RGB($H, $S, $L, &$R, &$G, &$B){

-		if ( $S == 0 ){

+	function HSL2RGB($H, $S, $L, &$R, &$G, &$B) {

+		if ($S == 0) {

 			$R = $L * 255;

 			$G = $L * 255;

 			$B = $L * 255;

-		}else{

-			$var_2 = ($L < 0.5)? ($L * ( 1 + $S )) : (( $L + $S ) - ( $S * $L ));

+		}else {

+			$var_2 = ($L < 0.5) ? ($L * (1 + $S)) : (($L + $S) - ($S * $L));

 			$var_1 = 2 * $L - $var_2;

-			$R = 255 * Color::_HSL_2_RGB( $var_1, $var_2, $H + ( 1 / 3 ) ) ;

-			$G = 255 * Color::_HSL_2_RGB( $var_1, $var_2, $H );

-			$B = 255 * Color::_HSL_2_RGB( $var_1, $var_2, $H - ( 1 / 3 ) );

+			$R = 255 * Color::_HSL_2_RGB($var_1, $var_2, $H + (1 / 3));

+			$G = 255 * Color::_HSL_2_RGB($var_1, $var_2, $H);

+			$B = 255 * Color::_HSL_2_RGB($var_1, $var_2, $H - (1 / 3));

 		}

 	}

 

 	/**

 	 * @desc Convert decimal color to #ffffff

 	 */

-	function RGB2HEX($r, $g, $b){

-		$r = ($r<16)? '0'.dechex($r) : dechex($r);

-		$g = ($g<16)? '0'.dechex($g) : dechex($g);

-		$b = ($b<16)? '0'.dechex($b) : dechex($b);

+	function RGB2HEX($r, $g, $b) {

+		$r = ($r < 16) ? '0'.dechex($r) : dechex($r);

+		$g = ($g < 16) ? '0'.dechex($g) : dechex($g);

+		$b = ($b < 16) ? '0'.dechex($b) : dechex($b);

 		return "#$r$g$b";

 	}

 

 	/**

 	 * @desc Convert color #ffffff to RGB

 	 */

-	function HEX2RGB($c){

-		if (strlen($c)!=7) return 0;

+	function HEX2RGB($c) {

+		if (strlen($c) != 7) return 0;

 		$r[] = hexdec($c{1}.$c{2});

 		$r[] = hexdec($c{3}.$c{4});

 		$r[] = hexdec($c{5}.$c{6});

@@ -61,21 +61,21 @@ 
 	/**

 	 * @desc Genereate an array of n colors differents

 	 */

-	function getListColor($n){

+	function getListColor($n) {

 		$h = 0;

 		$s = 1;

 		$l = 0.6;

 

-		$d = 1/($n+1);

-		$n2 = $n/2;

-		$n3 = intval($n/3);

+		$d = 1 / ($n + 1);

+		$n2 = $n / 2;

+		$n3 = intval($n / 3);

 		$c = 1;

-		for ($i=0;$i<$n;$i++){

-			Color::HSL2RGB($h,$s,$l,$r,$g,$b);

-			$color[] = Color::RGB2HEX($r,$g,$b);

-			$h += 3*$d;

-			if ($i % $n3==0){

-				$h = ($c++)*$d;

+		for ($i = 0; $i < $n; $i++) {

+			Color::HSL2RGB($h, $s, $l, $r, $g, $b);

+			$color[] = Color::RGB2HEX($r, $g, $b);

+			$h += 3 * $d;

+			if ($i % $n3 == 0) {

+				$h = ($c++) * $d;

 				$s -= 0.1;

 				$l -= 0.07;

 			}

Braces +19 added lines, -7 removed lines

@@ -10,11 +10,21 @@ 
 	 * @desc Use only for function HSL2RGB()

 	 */

 	function _HSL_2_RGB( $v1, $v2, $vH ){

-		if ( $vH < 0 ) $vH += 1;

-		if ( $vH > 1 ) $vH -= 1;

-		if ( ( 6 * $vH ) < 1 ) return ( $v1 + ( $v2 - $v1 ) * 6 * $vH );

-		if ( ( 2 * $vH ) < 1 ) return ( $v2 );

-		if ( ( 3 * $vH ) < 2 ) return ( $v1 + ( $v2 - $v1 ) * ( ( 2 / 3 ) - $vH ) * 6 );

+		if ( $vH < 0 ) {

+			$vH += 1;

+		}

+		if ( $vH > 1 ) {

+			$vH -= 1;

+		}

+		if ( ( 6 * $vH ) < 1 ) {

+			return ( $v1 + ( $v2 - $v1 ) * 6 * $vH );

+		}

+		if ( ( 2 * $vH ) < 1 ) {

+			return ( $v2 );

+		}

+		if ( ( 3 * $vH ) < 2 ) {

+			return ( $v1 + ( $v2 - $v1 ) * ( ( 2 / 3 ) - $vH ) * 6 );

+		}

 		return ( $v1 );

 	}

 	/**

@@ -28,7 +38,7 @@ 
 			$R = $L * 255;

 			$G = $L * 255;

 			$B = $L * 255;

-		}else{

+		} else{

 			$var_2 = ($L < 0.5)? ($L * ( 1 + $S )) : (( $L + $S ) - ( $S * $L ));

 			$var_1 = 2 * $L - $var_2;

 			$R = 255 * Color::_HSL_2_RGB( $var_1, $var_2, $H + ( 1 / 3 ) ) ;

@@ -51,7 +61,9 @@ 
 	 * @desc Convert color #ffffff to RGB

 	 */

 	function HEX2RGB($c){

-		if (strlen($c)!=7) return 0;

+		if (strlen($c)!=7) {

+			return 0;

+		}

 		$r[] = hexdec($c{1}.$c{2});

 		$r[] = hexdec($c{3}.$c{4});

 		$r[] = hexdec($c{5}.$c{6});

statistic/pdftable/lib/fpdf.inc.php

Spacing +795 added lines, -795 removed lines

@@ -7,205 +7,205 @@ 
 * Author:  Olivier PLATHEY                                                     *

 *******************************************************************************/

 

-define('FPDF_VERSION','1.6');

+define('FPDF_VERSION', '1.6');

 

 class FPDF

 {

-var $page;               //current page number

-var $n;                  //current object number

-var $offsets;            //array of object offsets

-var $buffer;             //buffer holding in-memory PDF

-var $pages;              //array containing pages

-var $state;              //current document state

-var $compress;           //compression flag

-var $k;                  //scale factor (number of points in user unit)

-var $DefOrientation;     //default orientation

-var $CurOrientation;     //current orientation

-var $PageFormats;        //available page formats

-var $DefPageFormat;      //default page format

-var $CurPageFormat;      //current page format

-var $PageSizes;          //array storing non-default page sizes

-var $wPt,$hPt;           //dimensions of current page in points

-var $w,$h;               //dimensions of current page in user unit

-var $lMargin;            //left margin

-var $tMargin;            //top margin

-var $rMargin;            //right margin

-var $bMargin;            //page break margin

-var $cMargin;            //cell margin

-var $x,$y;               //current position in user unit

-var $lasth;              //height of last printed cell

-var $LineWidth;          //line width in user unit

-var $CoreFonts;          //array of standard font names

-var $fonts;              //array of used fonts

-var $FontFiles;          //array of font files

-var $diffs;              //array of encoding differences

-var $FontFamily;         //current font family

-var $FontStyle;          //current font style

-var $underline;          //underlining flag

-var $CurrentFont;        //current font info

-var $FontSizePt;         //current font size in points

-var $FontSize;           //current font size in user unit

-var $DrawColor;          //commands for drawing color

-var $FillColor;          //commands for filling color

-var $TextColor;          //commands for text color

-var $ColorFlag;          //indicates whether fill and text colors are different

-var $ws;                 //word spacing

-var $images;             //array of used images

-var $PageLinks;          //array of links in pages

-var $links;              //array of internal links

-var $AutoPageBreak;      //automatic page breaking

-var $PageBreakTrigger;   //threshold used to trigger page breaks

-var $InHeader;           //flag set when processing header

-var $InFooter;           //flag set when processing footer

-var $ZoomMode;           //zoom display mode

-var $LayoutMode;         //layout display mode

-var $title;              //title

-var $subject;            //subject

-var $author;             //author

-var $keywords;           //keywords

-var $creator;            //creator

-var $AliasNbPages;       //alias for total number of pages

-var $PDFVersion;         //PDF version number

+var $page; //current page number

+var $n; //current object number

+var $offsets; //array of object offsets

+var $buffer; //buffer holding in-memory PDF

+var $pages; //array containing pages

+var $state; //current document state

+var $compress; //compression flag

+var $k; //scale factor (number of points in user unit)

+var $DefOrientation; //default orientation

+var $CurOrientation; //current orientation

+var $PageFormats; //available page formats

+var $DefPageFormat; //default page format

+var $CurPageFormat; //current page format

+var $PageSizes; //array storing non-default page sizes

+var $wPt, $hPt; //dimensions of current page in points

+var $w, $h; //dimensions of current page in user unit

+var $lMargin; //left margin

+var $tMargin; //top margin

+var $rMargin; //right margin

+var $bMargin; //page break margin

+var $cMargin; //cell margin

+var $x, $y; //current position in user unit

+var $lasth; //height of last printed cell

+var $LineWidth; //line width in user unit

+var $CoreFonts; //array of standard font names

+var $fonts; //array of used fonts

+var $FontFiles; //array of font files

+var $diffs; //array of encoding differences

+var $FontFamily; //current font family

+var $FontStyle; //current font style

+var $underline; //underlining flag

+var $CurrentFont; //current font info

+var $FontSizePt; //current font size in points

+var $FontSize; //current font size in user unit

+var $DrawColor; //commands for drawing color

+var $FillColor; //commands for filling color

+var $TextColor; //commands for text color

+var $ColorFlag; //indicates whether fill and text colors are different

+var $ws; //word spacing

+var $images; //array of used images

+var $PageLinks; //array of links in pages

+var $links; //array of internal links

+var $AutoPageBreak; //automatic page breaking

+var $PageBreakTrigger; //threshold used to trigger page breaks

+var $InHeader; //flag set when processing header

+var $InFooter; //flag set when processing footer

+var $ZoomMode; //zoom display mode

+var $LayoutMode; //layout display mode

+var $title; //title

+var $subject; //subject

+var $author; //author

+var $keywords; //keywords

+var $creator; //creator

+var $AliasNbPages; //alias for total number of pages

+var $PDFVersion; //PDF version number

 

 /*******************************************************************************

 *                                                                              *

 *                               Public methods                                 *

 *                                                                              *

 *******************************************************************************/

-function FPDF($orientation='P', $unit='mm', $format='A4')

+function FPDF($orientation = 'P', $unit = 'mm', $format = 'A4')

 {

 	//Some checks

 	$this->_dochecks();

 	//Initialization of properties

-	$this->page=0;

-	$this->n=2;

-	$this->buffer='';

-	$this->pages=array();

-	$this->PageSizes=array();

-	$this->state=0;

-	$this->fonts=array();

-	$this->FontFiles=array();

-	$this->diffs=array();

-	$this->images=array();

-	$this->links=array();

-	$this->InHeader=false;

-	$this->InFooter=false;

-	$this->lasth=0;

-	$this->FontFamily='';

-	$this->FontStyle='';

-	$this->FontSizePt=12;

-	$this->underline=false;

-	$this->DrawColor='0 G';

-	$this->FillColor='0 g';

-	$this->TextColor='0 g';

-	$this->ColorFlag=false;

-	$this->ws=0;

+	$this->page = 0;

+	$this->n = 2;

+	$this->buffer = '';

+	$this->pages = array();

+	$this->PageSizes = array();

+	$this->state = 0;

+	$this->fonts = array();

+	$this->FontFiles = array();

+	$this->diffs = array();

+	$this->images = array();

+	$this->links = array();

+	$this->InHeader = false;

+	$this->InFooter = false;

+	$this->lasth = 0;

+	$this->FontFamily = '';

+	$this->FontStyle = '';

+	$this->FontSizePt = 12;

+	$this->underline = false;

+	$this->DrawColor = '0 G';

+	$this->FillColor = '0 g';

+	$this->TextColor = '0 g';

+	$this->ColorFlag = false;

+	$this->ws = 0;

 	//Standard fonts

-	$this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',

+	$this->CoreFonts = array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',

 		'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',

 		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',

 		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');

 	//Scale factor

-	if($unit=='pt')

-		$this->k=1;

-	elseif($unit=='mm')

-		$this->k=72/25.4;

-	elseif($unit=='cm')

-		$this->k=72/2.54;

-	elseif($unit=='in')

-		$this->k=72;

+	if ($unit == 'pt')

+		$this->k = 1;

+	elseif ($unit == 'mm')

+		$this->k = 72 / 25.4;

+	elseif ($unit == 'cm')

+		$this->k = 72 / 2.54;

+	elseif ($unit == 'in')

+		$this->k = 72;

 	else

 		$this->Error('Incorrect unit: '.$unit);

 	//Page format

-	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),

-		'letter'=>array(612,792), 'legal'=>array(612,1008));

-	if(is_string($format))

-		$format=$this->_getpageformat($format);

-	$this->DefPageFormat=$format;

-	$this->CurPageFormat=$format;

+	$this->PageFormats = array('a3'=>array(841.89, 1190.55), 'a4'=>array(595.28, 841.89), 'a5'=>array(420.94, 595.28),

+		'letter'=>array(612, 792), 'legal'=>array(612, 1008));

+	if (is_string($format))

+		$format = $this->_getpageformat($format);

+	$this->DefPageFormat = $format;

+	$this->CurPageFormat = $format;

 	//Page orientation

-	$orientation=strtolower($orientation);

-	if($orientation=='p' || $orientation=='portrait')

+	$orientation = strtolower($orientation);

+	if ($orientation == 'p' || $orientation == 'portrait')

 	{

-		$this->DefOrientation='P';

-		$this->w=$this->DefPageFormat[0];

-		$this->h=$this->DefPageFormat[1];

+		$this->DefOrientation = 'P';

+		$this->w = $this->DefPageFormat[0];

+		$this->h = $this->DefPageFormat[1];

 	}

-	elseif($orientation=='l' || $orientation=='landscape')

+	elseif ($orientation == 'l' || $orientation == 'landscape')

 	{

-		$this->DefOrientation='L';

-		$this->w=$this->DefPageFormat[1];

-		$this->h=$this->DefPageFormat[0];

+		$this->DefOrientation = 'L';

+		$this->w = $this->DefPageFormat[1];

+		$this->h = $this->DefPageFormat[0];

 	}

 	else

 		$this->Error('Incorrect orientation: '.$orientation);

-	$this->CurOrientation=$this->DefOrientation;

-	$this->wPt=$this->w*$this->k;

-	$this->hPt=$this->h*$this->k;

+	$this->CurOrientation = $this->DefOrientation;

+	$this->wPt = $this->w * $this->k;

+	$this->hPt = $this->h * $this->k;

 	//Page margins (1 cm)

-	$margin=28.35/$this->k;

-	$this->SetMargins($margin,$margin);

+	$margin = 28.35 / $this->k;

+	$this->SetMargins($margin, $margin);

 	//Interior cell margin (1 mm)

-	$this->cMargin=$margin/10;

+	$this->cMargin = $margin / 10;

 	//Line width (0.2 mm)

-	$this->LineWidth=.567/$this->k;

+	$this->LineWidth = .567 / $this->k;

 	//Automatic page break

-	$this->SetAutoPageBreak(true,2*$margin);

+	$this->SetAutoPageBreak(true, 2 * $margin);

 	//Full width display mode

 	$this->SetDisplayMode('fullwidth');

 	//Enable compression

 	$this->SetCompression(true);

 	//Set default PDF version number

-	$this->PDFVersion='1.3';

+	$this->PDFVersion = '1.3';

 }

 

-function SetMargins($left, $top, $right=null)

+function SetMargins($left, $top, $right = null)

 {

 	//Set left, top and right margins

-	$this->lMargin=$left;

-	$this->tMargin=$top;

-	if($right===null)

-		$right=$left;

-	$this->rMargin=$right;

+	$this->lMargin = $left;

+	$this->tMargin = $top;

+	if ($right === null)

+		$right = $left;

+	$this->rMargin = $right;

 }

 

 function SetLeftMargin($margin)

 {

 	//Set left margin

-	$this->lMargin=$margin;

-	if($this->page>0 && $this->x<$margin)

-		$this->x=$margin;

+	$this->lMargin = $margin;

+	if ($this->page > 0 && $this->x < $margin)

+		$this->x = $margin;

 }

 

 function SetTopMargin($margin)

 {

 	//Set top margin

-	$this->tMargin=$margin;

+	$this->tMargin = $margin;

 }

 

 function SetRightMargin($margin)

 {

 	//Set right margin

-	$this->rMargin=$margin;

+	$this->rMargin = $margin;

 }

 

-function SetAutoPageBreak($auto, $margin=0)

+function SetAutoPageBreak($auto, $margin = 0)

 {

 	//Set auto page break mode and triggering margin

-	$this->AutoPageBreak=$auto;

-	$this->bMargin=$margin;

-	$this->PageBreakTrigger=$this->h-$margin;

+	$this->AutoPageBreak = $auto;

+	$this->bMargin = $margin;

+	$this->PageBreakTrigger = $this->h - $margin;

 }

 

-function SetDisplayMode($zoom, $layout='continuous')

+function SetDisplayMode($zoom, $layout = 'continuous')

 {

 	//Set display mode in viewer

-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

-		$this->ZoomMode=$zoom;

+	if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))

+		$this->ZoomMode = $zoom;

 	else

 		$this->Error('Incorrect zoom display mode: '.$zoom);

-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

-		$this->LayoutMode=$layout;

+	if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')

+		$this->LayoutMode = $layout;

 	else

 		$this->Error('Incorrect layout display mode: '.$layout);

 }

@@ -213,56 +213,56 @@ 
 function SetCompression($compress)

 {

 	//Set page compression

-	if(function_exists('gzcompress'))

-		$this->compress=$compress;

+	if (function_exists('gzcompress'))

+		$this->compress = $compress;

 	else

-		$this->compress=false;

+		$this->compress = false;

 }

 

-function SetTitle($title, $isUTF8=false)

+function SetTitle($title, $isUTF8 = false)

 {

 	//Title of document

-	if($isUTF8)

-		$title=$this->_UTF8toUTF16($title);

-	$this->title=$title;

+	if ($isUTF8)

+		$title = $this->_UTF8toUTF16($title);

+	$this->title = $title;

 }

 

-function SetSubject($subject, $isUTF8=false)

+function SetSubject($subject, $isUTF8 = false)

 {

 	//Subject of document

-	if($isUTF8)

-		$subject=$this->_UTF8toUTF16($subject);

-	$this->subject=$subject;

+	if ($isUTF8)

+		$subject = $this->_UTF8toUTF16($subject);

+	$this->subject = $subject;

 }

 

-function SetAuthor($author, $isUTF8=false)

+function SetAuthor($author, $isUTF8 = false)

 {

 	//Author of document

-	if($isUTF8)

-		$author=$this->_UTF8toUTF16($author);

-	$this->author=$author;

+	if ($isUTF8)

+		$author = $this->_UTF8toUTF16($author);

+	$this->author = $author;

 }

 

-function SetKeywords($keywords, $isUTF8=false)

+function SetKeywords($keywords, $isUTF8 = false)

 {

 	//Keywords of document

-	if($isUTF8)

-		$keywords=$this->_UTF8toUTF16($keywords);

-	$this->keywords=$keywords;

+	if ($isUTF8)

+		$keywords = $this->_UTF8toUTF16($keywords);

+	$this->keywords = $keywords;

 }

 

-function SetCreator($creator, $isUTF8=false)

+function SetCreator($creator, $isUTF8 = false)

 {

 	//Creator of document

-	if($isUTF8)

-		$creator=$this->_UTF8toUTF16($creator);

-	$this->creator=$creator;

+	if ($isUTF8)

+		$creator = $this->_UTF8toUTF16($creator);

+	$this->creator = $creator;

 }

 

-function AliasNbPages($alias='{nb}')

+function AliasNbPages($alias = '{nb}')

 {

 	//Define an alias for total number of pages

-	$this->AliasNbPages=$alias;

+	$this->AliasNbPages = $alias;

 }

 

 function Error($msg)

@@ -274,93 +274,93 @@ 
 function Open()

 {

 	//Begin document

-	$this->state=1;

+	$this->state = 1;

 }

 

 function Close()

 {

 	//Terminate document

-	if($this->state==3)

+	if ($this->state == 3)

 		return;

-	if($this->page==0)

+	if ($this->page == 0)

 		$this->AddPage();

 	//Page footer

-	$this->InFooter=true;

+	$this->InFooter = true;

 	$this->Footer();

-	$this->InFooter=false;

+	$this->InFooter = false;

 	//Close page

 	$this->_endpage();

 	//Close document

 	$this->_enddoc();

 }

 

-function AddPage($orientation='', $format='')

+function AddPage($orientation = '', $format = '')

 {

 	//Start a new page

-	if($this->state==0)

+	if ($this->state == 0)

 		$this->Open();

-	$family=$this->FontFamily;

-	$style=$this->FontStyle.($this->underline ? 'U' : '');

-	$size=$this->FontSizePt;

-	$lw=$this->LineWidth;

-	$dc=$this->DrawColor;

-	$fc=$this->FillColor;

-	$tc=$this->TextColor;

-	$cf=$this->ColorFlag;

-	if($this->page>0)

+	$family = $this->FontFamily;

+	$style = $this->FontStyle.($this->underline ? 'U' : '');

+	$size = $this->FontSizePt;

+	$lw = $this->LineWidth;

+	$dc = $this->DrawColor;

+	$fc = $this->FillColor;

+	$tc = $this->TextColor;

+	$cf = $this->ColorFlag;

+	if ($this->page > 0)

 	{

 		//Page footer

-		$this->InFooter=true;

+		$this->InFooter = true;

 		$this->Footer();

-		$this->InFooter=false;

+		$this->InFooter = false;

 		//Close page

 		$this->_endpage();

 	}

 	//Start new page

-	$this->_beginpage($orientation,$format);

+	$this->_beginpage($orientation, $format);

 	//Set line cap style to square

 	$this->_out('2 J');

 	//Set line width

-	$this->LineWidth=$lw;

-	$this->_out(sprintf('%.2F w',$lw*$this->k));

+	$this->LineWidth = $lw;

+	$this->_out(sprintf('%.2F w', $lw * $this->k));

 	//Set font

-	if($family)

-		$this->SetFont($family,$style,$size);

+	if ($family)

+		$this->SetFont($family, $style, $size);

 	//Set colors

-	$this->DrawColor=$dc;

-	if($dc!='0 G')

+	$this->DrawColor = $dc;

+	if ($dc != '0 G')

 		$this->_out($dc);

-	$this->FillColor=$fc;

-	if($fc!='0 g')

+	$this->FillColor = $fc;

+	if ($fc != '0 g')

 		$this->_out($fc);

-	$this->TextColor=$tc;

-	$this->ColorFlag=$cf;

+	$this->TextColor = $tc;

+	$this->ColorFlag = $cf;

 	//Page header

-	$this->InHeader=true;

+	$this->InHeader = true;

 	$this->Header();

-	$this->InHeader=false;

+	$this->InHeader = false;

 	//Restore line width

-	if($this->LineWidth!=$lw)

+	if ($this->LineWidth != $lw)

 	{

-		$this->LineWidth=$lw;

-		$this->_out(sprintf('%.2F w',$lw*$this->k));

+		$this->LineWidth = $lw;

+		$this->_out(sprintf('%.2F w', $lw * $this->k));

 	}

 	//Restore font

-	if($family)

-		$this->SetFont($family,$style,$size);

+	if ($family)

+		$this->SetFont($family, $style, $size);

 	//Restore colors

-	if($this->DrawColor!=$dc)

+	if ($this->DrawColor != $dc)

 	{

-		$this->DrawColor=$dc;

+		$this->DrawColor = $dc;

 		$this->_out($dc);

 	}

-	if($this->FillColor!=$fc)

+	if ($this->FillColor != $fc)

 	{

-		$this->FillColor=$fc;

+		$this->FillColor = $fc;

 		$this->_out($fc);

 	}

-	$this->TextColor=$tc;

-	$this->ColorFlag=$cf;

+	$this->TextColor = $tc;

+	$this->ColorFlag = $cf;

 }

 

 function Header()

@@ -379,230 +379,230 @@ 
 	return $this->page;

 }

 

-function SetDrawColor($r, $g=null, $b=null)

+function SetDrawColor($r, $g = null, $b = null)

 {

 	//Set color for all stroking operations

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->DrawColor=sprintf('%.3F G',$r/255);

+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)

+		$this->DrawColor = sprintf('%.3F G', $r / 255);

 	else

-		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);

-	if($this->page>0)

+		$this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);

+	if ($this->page > 0)

 		$this->_out($this->DrawColor);

 }

 

-function SetFillColor($r, $g=null, $b=null)

+function SetFillColor($r, $g = null, $b = null)

 {

 	//Set color for all filling operations

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->FillColor=sprintf('%.3F g',$r/255);

+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)

+		$this->FillColor = sprintf('%.3F g', $r / 255);

 	else

-		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

-	$this->ColorFlag=($this->FillColor!=$this->TextColor);

-	if($this->page>0)

+		$this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);

+	$this->ColorFlag = ($this->FillColor != $this->TextColor);

+	if ($this->page > 0)

 		$this->_out($this->FillColor);

 }

 

-function SetTextColor($r, $g=null, $b=null)

+function SetTextColor($r, $g = null, $b = null)

 {

 	//Set color for text

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->TextColor=sprintf('%.3F g',$r/255);

+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)

+		$this->TextColor = sprintf('%.3F g', $r / 255);

 	else

-		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

-	$this->ColorFlag=($this->FillColor!=$this->TextColor);

+		$this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);

+	$this->ColorFlag = ($this->FillColor != $this->TextColor);

 }

 

 function GetStringWidth($s)

 {

 	//Get width of a string in the current font

-	$s=(string)$s;

-	$cw=&$this->CurrentFont['cw'];

-	$w=0;

-	$l=strlen($s);

-	for($i=0;$i<$l;$i++)

-		$w+=$cw[$s[$i]];

-	return $w*$this->FontSize/1000;

+	$s = (string) $s;

+	$cw = &$this->CurrentFont['cw'];

+	$w = 0;

+	$l = strlen($s);

+	for ($i = 0; $i < $l; $i++)

+		$w += $cw[$s[$i]];

+	return $w * $this->FontSize / 1000;

 }

 

 function SetLineWidth($width)

 {

 	//Set line width

-	$this->LineWidth=$width;

-	if($this->page>0)

-		$this->_out(sprintf('%.2F w',$width*$this->k));

+	$this->LineWidth = $width;

+	if ($this->page > 0)

+		$this->_out(sprintf('%.2F w', $width * $this->k));

 }

 

 function Line($x1, $y1, $x2, $y2)

 {

 	//Draw a line

-	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));

+	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));

 }

 

-function Rect($x, $y, $w, $h, $style='')

+function Rect($x, $y, $w, $h, $style = '')

 {

 	//Draw a rectangle

-	if($style=='F')

-		$op='f';

-	elseif($style=='FD' || $style=='DF')

-		$op='B';

+	if ($style == 'F')

+		$op = 'f';

+	elseif ($style == 'FD' || $style == 'DF')

+		$op = 'B';

 	else

-		$op='S';

-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));

+		$op = 'S';

+	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));

 }

 

-function AddFont($family, $style='', $file='')

+function AddFont($family, $style = '', $file = '')

 {

 	//Add a TrueType or Type1 font

-	$family=strtolower($family);

-	if($file=='')

-		$file=str_replace(' ','',$family).strtolower($style).'.php';

-	if($family=='arial')

-		$family='helvetica';

-	$style=strtoupper($style);

-	if($style=='IB')

-		$style='BI';

-	$fontkey=$family.$style;

-	if(isset($this->fonts[$fontkey]))

+	$family = strtolower($family);

+	if ($file == '')

+		$file = str_replace(' ', '', $family).strtolower($style).'.php';

+	if ($family == 'arial')

+		$family = 'helvetica';

+	$style = strtoupper($style);

+	if ($style == 'IB')

+		$style = 'BI';

+	$fontkey = $family.$style;

+	if (isset($this->fonts[$fontkey]))

 		return;

 	include($this->_getfontpath().$file);

-	if(!isset($name))

+	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)

+	$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)

 	{

 		//Search existing encodings

-		$d=0;

-		$nb=count($this->diffs);

-		for($i=1;$i<=$nb;$i++)

+		$d = 0;

+		$nb = count($this->diffs);

+		for ($i = 1; $i <= $nb; $i++)

 		{

-			if($this->diffs[$i]==$diff)

+			if ($this->diffs[$i] == $diff)

 			{

-				$d=$i;

+				$d = $i;

 				break;

 			}

 		}

-		if($d==0)

+		if ($d == 0)

 		{

-			$d=$nb+1;

-			$this->diffs[$d]=$diff;

+			$d = $nb + 1;

+			$this->diffs[$d] = $diff;

 		}

-		$this->fonts[$fontkey]['diff']=$d;

+		$this->fonts[$fontkey]['diff'] = $d;

 	}

-	if($file)

+	if ($file)

 	{

-		if($type=='TrueType')

-			$this->FontFiles[$file]=array('length1'=>$originalsize);

+		if ($type == 'TrueType')

+			$this->FontFiles[$file] = array('length1'=>$originalsize);

 		else

-			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);

+			$this->FontFiles[$file] = array('length1'=>$size1, 'length2'=>$size2);

 	}

 }

 

-function SetFont($family, $style='', $size=0)

+function SetFont($family, $style = '', $size = 0)

 {

 	//Select a font; size given in points

 	global $fpdf_charwidths;

 

-	$family=strtolower($family);

-	if($family=='')

-		$family=$this->FontFamily;

-	if($family=='arial')

-		$family='helvetica';

-	elseif($family=='symbol' || $family=='zapfdingbats')

-		$style='';

-	$style=strtoupper($style);

-	if(strpos($style,'U')!==false)

+	$family = strtolower($family);

+	if ($family == '')

+		$family = $this->FontFamily;

+	if ($family == 'arial')

+		$family = 'helvetica';

+	elseif ($family == 'symbol' || $family == 'zapfdingbats')

+		$style = '';

+	$style = strtoupper($style);

+	if (strpos($style, 'U') !== false)

 	{

-		$this->underline=true;

-		$style=str_replace('U','',$style);

+		$this->underline = true;

+		$style = str_replace('U', '', $style);

 	}

 	else

-		$this->underline=false;

-	if($style=='IB')

-		$style='BI';

-	if($size==0)

-		$size=$this->FontSizePt;

+		$this->underline = false;

+	if ($style == 'IB')

+		$style = 'BI';

+	if ($size == 0)

+		$size = $this->FontSizePt;

 	//Test if font is already selected

-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

+	if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size)

 		return;

 	//Test if used for the first time

-	$fontkey=$family.$style;

-	if(!isset($this->fonts[$fontkey]))

+	$fontkey = $family.$style;

+	if (!isset($this->fonts[$fontkey]))

 	{

 		//Check if one of the standard fonts

-		if(isset($this->CoreFonts[$fontkey]))

+		if (isset($this->CoreFonts[$fontkey]))

 		{

-			if(!isset($fpdf_charwidths[$fontkey]))

+			if (!isset($fpdf_charwidths[$fontkey]))

 			{

 				//Load metric file

-				$file=$family;

-				if($family=='times' || $family=='helvetica')

-					$file.=strtolower($style);

+				$file = $family;

+				if ($family == 'times' || $family == 'helvetica')

+					$file .= strtolower($style);

 				include($this->_getfontpath().$file.'.php');

-				if(!isset($fpdf_charwidths[$fontkey]))

+				if (!isset($fpdf_charwidths[$fontkey]))

 					$this->Error('Could not include font metric file');

 			}

-			$i=count($this->fonts)+1;

-			$name=$this->CoreFonts[$fontkey];

-			$cw=$fpdf_charwidths[$fontkey];

-			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);

+			$i = count($this->fonts) + 1;

+			$name = $this->CoreFonts[$fontkey];

+			$cw = $fpdf_charwidths[$fontkey];

+			$this->fonts[$fontkey] = array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);

 		}

 		else

 			$this->Error('Undefined font: '.$family.' '.$style);

 	}

 	//Select it

-	$this->FontFamily=$family;

-	$this->FontStyle=$style;

-	$this->FontSizePt=$size;

-	$this->FontSize=$size/$this->k;

-	$this->CurrentFont=&$this->fonts[$fontkey];

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	$this->FontFamily = $family;

+	$this->FontStyle = $style;

+	$this->FontSizePt = $size;

+	$this->FontSize = $size / $this->k;

+	$this->CurrentFont = &$this->fonts[$fontkey];

+	if ($this->page > 0)

+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

 }

 

 function SetFontSize($size)

 {

 	//Set font size in points

-	if($this->FontSizePt==$size)

+	if ($this->FontSizePt == $size)

 		return;

-	$this->FontSizePt=$size;

-	$this->FontSize=$size/$this->k;

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	$this->FontSizePt = $size;

+	$this->FontSize = $size / $this->k;

+	if ($this->page > 0)

+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

 }

 

 function AddLink()

 {

 	//Create a new internal link

-	$n=count($this->links)+1;

-	$this->links[$n]=array(0, 0);

+	$n = count($this->links) + 1;

+	$this->links[$n] = array(0, 0);

 	return $n;

 }

 

-function SetLink($link, $y=0, $page=-1)

+function SetLink($link, $y = 0, $page = -1)

 {

 	//Set destination of internal link

-	if($y==-1)

-		$y=$this->y;

-	if($page==-1)

-		$page=$this->page;

-	$this->links[$link]=array($page, $y);

+	if ($y == -1)

+		$y = $this->y;

+	if ($page == -1)

+		$page = $this->page;

+	$this->links[$link] = array($page, $y);

 }

 

 function Link($x, $y, $w, $h, $link)

 {

 	//Put a link on the page

-	$this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);

+	$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);

 }

 

 function Text($x, $y, $txt)

 {

 	//Output a string

-	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));

-	if($this->underline && $txt!='')

-		$s.=' '.$this->_dounderline($x,$y,$txt);

-	if($this->ColorFlag)

-		$s='q '.$this->TextColor.' '.$s.' Q';

+	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->_escape($txt));

+	if ($this->underline && $txt != '')

+		$s .= ' '.$this->_dounderline($x, $y, $txt);

+	if ($this->ColorFlag)

+		$s = 'q '.$this->TextColor.' '.$s.' Q';

 	$this->_out($s);

 }

 

@@ -612,268 +612,268 @@ 
 	return $this->AutoPageBreak;

 }

 

-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')

+function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '')

 {

 	//Output a cell

-	$k=$this->k;

-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

+	$k = $this->k;

+	if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

 	{

 		//Automatic page break

-		$x=$this->x;

-		$ws=$this->ws;

-		if($ws>0)

+		$x = $this->x;

+		$ws = $this->ws;

+		if ($ws > 0)

 		{

-			$this->ws=0;

+			$this->ws = 0;

 			$this->_out('0 Tw');

 		}

-		$this->AddPage($this->CurOrientation,$this->CurPageFormat);

-		$this->x=$x;

-		if($ws>0)

+		$this->AddPage($this->CurOrientation, $this->CurPageFormat);

+		$this->x = $x;

+		if ($ws > 0)

 		{

-			$this->ws=$ws;

-			$this->_out(sprintf('%.3F Tw',$ws*$k));

+			$this->ws = $ws;

+			$this->_out(sprintf('%.3F Tw', $ws * $k));

 		}

 	}

-	if($w==0)

-		$w=$this->w-$this->rMargin-$this->x;

-	$s='';

-	if($fill || $border==1)

+	if ($w == 0)

+		$w = $this->w - $this->rMargin - $this->x;

+	$s = '';

+	if ($fill || $border == 1)

 	{

-		if($fill)

-			$op=($border==1) ? 'B' : 'f';

+		if ($fill)

+			$op = ($border == 1) ? 'B' : 'f';

 		else

-			$op='S';

-		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);

+			$op = 'S';

+		$s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);

 	}

-	if(is_string($border))

+	if (is_string($border))

 	{

-		$x=$this->x;

-		$y=$this->y;

-		if(strpos($border,'L')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

-		if(strpos($border,'T')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

-		if(strpos($border,'R')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

-		if(strpos($border,'B')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+		$x = $this->x;

+		$y = $this->y;

+		if (strpos($border, 'L') !== false)

+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);

+		if (strpos($border, 'T') !== false)

+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);

+		if (strpos($border, 'R') !== false)

+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);

+		if (strpos($border, 'B') !== false)

+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);

 	}

-	if($txt!=='')

+	if ($txt !== '')

 	{

-		if($align=='R')

-			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);

-		elseif($align=='C')

-			$dx=($w-$this->GetStringWidth($txt))/2;

+		if ($align == 'R')

+			$dx = $w - $this->cMargin - $this->GetStringWidth($txt);

+		elseif ($align == 'C')

+			$dx = ($w - $this->GetStringWidth($txt)) / 2;

 		else

-			$dx=$this->cMargin;

-		if($this->ColorFlag)

-			$s.='q '.$this->TextColor.' ';

-		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));

-		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);

-		if($this->underline)

-			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-		if($this->ColorFlag)

-			$s.=' Q';

-		if($link)

-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);

+			$dx = $this->cMargin;

+		if ($this->ColorFlag)

+			$s .= 'q '.$this->TextColor.' ';

+		$txt2 = str_replace(')', '\\)', str_replace('(', '\\(', str_replace('\\', '\\\\', $txt)));

+		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $txt2);

+		if ($this->underline)

+			$s .= ' '.$this->_dounderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);

+		if ($this->ColorFlag)

+			$s .= ' Q';

+		if ($link)

+			$this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);

 	}

-	if($s)

+	if ($s)

 		$this->_out($s);

-	$this->lasth=$h;

-	if($ln>0)

+	$this->lasth = $h;

+	if ($ln > 0)

 	{

 		//Go to next line

-		$this->y+=$h;

-		if($ln==1)

-			$this->x=$this->lMargin;

+		$this->y += $h;

+		if ($ln == 1)

+			$this->x = $this->lMargin;

 	}

 	else

-		$this->x+=$w;

+		$this->x += $w;

 }

 

-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)

+function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false)

 {

 	//Output text with automatic or explicit line breaks

-	$cw=&$this->CurrentFont['cw'];

-	if($w==0)

-		$w=$this->w-$this->rMargin-$this->x;

-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

-	$s=str_replace("\r",'',$txt);

-	$nb=strlen($s);

-	if($nb>0 && $s[$nb-1]=="\n")

+	$cw = &$this->CurrentFont['cw'];

+	if ($w == 0)

+		$w = $this->w - $this->rMargin - $this->x;

+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

+	$s = str_replace("\r", '', $txt);

+	$nb = strlen($s);

+	if ($nb > 0 && $s[$nb - 1] == "\n")

 		$nb--;

-	$b=0;

-	if($border)

+	$b = 0;

+	if ($border)

 	{

-		if($border==1)

+		if ($border == 1)

 		{

-			$border='LTRB';

-			$b='LRT';

-			$b2='LR';

+			$border = 'LTRB';

+			$b = 'LRT';

+			$b2 = 'LR';

 		}

 		else

 		{

-			$b2='';

-			if(strpos($border,'L')!==false)

-				$b2.='L';

-			if(strpos($border,'R')!==false)

-				$b2.='R';

-			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;

+			$b2 = '';

+			if (strpos($border, 'L') !== false)

+				$b2 .= 'L';

+			if (strpos($border, 'R') !== false)

+				$b2 .= 'R';

+			$b = (strpos($border, 'T') !== false) ? $b2.'T' : $b2;

 		}

 	}

-	$sep=-1;

-	$i=0;

-	$j=0;

-	$l=0;

-	$ns=0;

-	$nl=1;

-	while($i<$nb)

+	$sep = -1;

+	$i = 0;

+	$j = 0;

+	$l = 0;

+	$ns = 0;

+	$nl = 1;

+	while ($i < $nb)

 	{

 		//Get next character

-		$c=$s[$i];

-		if($c=="\n")

+		$c = $s[$i];

+		if ($c == "\n")

 		{

 			//Explicit line break

-			if($this->ws>0)

+			if ($this->ws > 0)

 			{

-				$this->ws=0;

+				$this->ws = 0;

 				$this->_out('0 Tw');

 			}

-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+			$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

 			$i++;

-			$sep=-1;

-			$j=$i;

-			$l=0;

-			$ns=0;

+			$sep = -1;

+			$j = $i;

+			$l = 0;

+			$ns = 0;

 			$nl++;

-			if($border && $nl==2)

-				$b=$b2;

+			if ($border && $nl == 2)

+				$b = $b2;

 			continue;

 		}

-		if($c==' ')

+		if ($c == ' ')

 		{

-			$sep=$i;

-			$ls=$l;

+			$sep = $i;

+			$ls = $l;

 			$ns++;

 		}

-		$l+=$cw[$c];

-		if($l>$wmax)

+		$l += $cw[$c];

+		if ($l > $wmax)

 		{

 			//Automatic line break

-			if($sep==-1)

+			if ($sep == -1)

 			{

-				if($i==$j)

+				if ($i == $j)

 					$i++;

-				if($this->ws>0)

+				if ($this->ws > 0)

 				{

-					$this->ws=0;

+					$this->ws = 0;

 					$this->_out('0 Tw');

 				}

-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+				$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

 			}

 			else

 			{

-				if($align=='J')

+				if ($align == 'J')

 				{

-					$this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;

-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));

+					$this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0;

+					$this->_out(sprintf('%.3F Tw', $this->ws * $this->k));

 				}

-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);

-				$i=$sep+1;

+				$this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);

+				$i = $sep + 1;

 			}

-			$sep=-1;

-			$j=$i;

-			$l=0;

-			$ns=0;

+			$sep = -1;

+			$j = $i;

+			$l = 0;

+			$ns = 0;

 			$nl++;

-			if($border && $nl==2)

-				$b=$b2;

+			if ($border && $nl == 2)

+				$b = $b2;

 		}

 		else

 			$i++;

 	}

 	//Last chunk

-	if($this->ws>0)

+	if ($this->ws > 0)

 	{

-		$this->ws=0;

+		$this->ws = 0;

 		$this->_out('0 Tw');

 	}

-	if($border && strpos($border,'B')!==false)

-		$b.='B';

-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

-	$this->x=$this->lMargin;

+	if ($border && strpos($border, 'B') !== false)

+		$b .= 'B';

+	$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

+	$this->x = $this->lMargin;

 }

 

-function Write($h, $txt, $link='')

+function Write($h, $txt, $link = '')

 {

 	//Output text in flowing mode

-	$cw=&$this->CurrentFont['cw'];

-	$w=$this->w-$this->rMargin-$this->x;

-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

-	$s=str_replace("\r",'',$txt);

-	$nb=strlen($s);

-	$sep=-1;

-	$i=0;

-	$j=0;

-	$l=0;

-	$nl=1;

-	while($i<$nb)

+	$cw = &$this->CurrentFont['cw'];

+	$w = $this->w - $this->rMargin - $this->x;

+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

+	$s = str_replace("\r", '', $txt);

+	$nb = strlen($s);

+	$sep = -1;

+	$i = 0;

+	$j = 0;

+	$l = 0;

+	$nl = 1;

+	while ($i < $nb)

 	{

 		//Get next character

-		$c=$s[$i];

-		if($c=="\n")

+		$c = $s[$i];

+		if ($c == "\n")

 		{

 			//Explicit line break

-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);

+			$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);

 			$i++;

-			$sep=-1;

-			$j=$i;

-			$l=0;

-			if($nl==1)

+			$sep = -1;

+			$j = $i;

+			$l = 0;

+			if ($nl == 1)

 			{

-				$this->x=$this->lMargin;

-				$w=$this->w-$this->rMargin-$this->x;

-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

+				$this->x = $this->lMargin;

+				$w = $this->w - $this->rMargin - $this->x;

+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

 			}

 			$nl++;

 			continue;

 		}

-		if($c==' ')

-			$sep=$i;

-		$l+=$cw[$c];

-		if($l>$wmax)

+		if ($c == ' ')

+			$sep = $i;

+		$l += $cw[$c];

+		if ($l > $wmax)

 		{

 			//Automatic line break

-			if($sep==-1)

+			if ($sep == -1)

 			{

-				if($this->x>$this->lMargin)

+				if ($this->x > $this->lMargin)

 				{

 					//Move to next line

-					$this->x=$this->lMargin;

-					$this->y+=$h;

-					$w=$this->w-$this->rMargin-$this->x;

-					$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

+					$this->x = $this->lMargin;

+					$this->y += $h;

+					$w = $this->w - $this->rMargin - $this->x;

+					$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

 					$i++;

 					$nl++;

 					continue;

 				}

-				if($i==$j)

+				if ($i == $j)

 					$i++;

-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);

+				$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);

 			}

 			else

 			{

-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);

-				$i=$sep+1;

+				$this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);

+				$i = $sep + 1;

 			}

-			$sep=-1;

-			$j=$i;

-			$l=0;

-			if($nl==1)

+			$sep = -1;

+			$j = $i;

+			$l = 0;

+			if ($nl == 1)

 			{

-				$this->x=$this->lMargin;

-				$w=$this->w-$this->rMargin-$this->x;

-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

+				$this->x = $this->lMargin;

+				$w = $this->w - $this->rMargin - $this->x;

+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

 			}

 			$nl++;

 		}

@@ -881,74 +881,74 @@ 
 			$i++;

 	}

 	//Last chunk

-	if($i!=$j)

-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);

+	if ($i != $j)

+		$this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', 0, $link);

 }

 

-function Ln($h=null)

+function Ln($h = null)

 {

 	//Line feed; default value is last cell height

-	$this->x=$this->lMargin;

-	if($h===null)

-		$this->y+=$this->lasth;

+	$this->x = $this->lMargin;

+	if ($h === null)

+		$this->y += $this->lasth;

 	else

-		$this->y+=$h;

+		$this->y += $h;

 }

 

-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')

+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')

 {

 	//Put an image on the page

-	if(!isset($this->images[$file]))

+	if (!isset($this->images[$file]))

 	{

 		//First use of this image, get info

-		if($type=='')

+		if ($type == '')

 		{

-			$pos=strrpos($file,'.');

-			if(!$pos)

+			$pos = strrpos($file, '.');

+			if (!$pos)

 				$this->Error('Image file has no extension and no type was specified: '.$file);

-			$type=substr($file,$pos+1);

+			$type = substr($file, $pos + 1);

 		}

-		$type=strtolower($type);

-		if($type=='jpeg')

-			$type='jpg';

-		$mtd='_parse'.$type;

-		if(!method_exists($this,$mtd))

+		$type = strtolower($type);

+		if ($type == 'jpeg')

+			$type = 'jpg';

+		$mtd = '_parse'.$type;

+		if (!method_exists($this, $mtd))

 			$this->Error('Unsupported image type: '.$type);

-		$info=$this->$mtd($file);

-		$info['i']=count($this->images)+1;

-		$this->images[$file]=$info;

+		$info = $this->$mtd($file);

+		$info['i'] = count($this->images) + 1;

+		$this->images[$file] = $info;

 	}

 	else

-		$info=$this->images[$file];

+		$info = $this->images[$file];

 	//Automatic width and height calculation if needed

-	if($w==0 && $h==0)

+	if ($w == 0 && $h == 0)

 	{

 		//Put image at 72 dpi

-		$w=$info['w']/$this->k;

-		$h=$info['h']/$this->k;

+		$w = $info['w'] / $this->k;

+		$h = $info['h'] / $this->k;

 	}

-	elseif($w==0)

-		$w=$h*$info['w']/$info['h'];

-	elseif($h==0)

-		$h=$w*$info['h']/$info['w'];

+	elseif ($w == 0)

+		$w = $h * $info['w'] / $info['h'];

+	elseif ($h == 0)

+		$h = $w * $info['h'] / $info['w'];

 	//Flowing mode

-	if($y===null)

+	if ($y === null)

 	{

-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

+		if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

 		{

 			//Automatic page break

-			$x2=$this->x;

-			$this->AddPage($this->CurOrientation,$this->CurPageFormat);

-			$this->x=$x2;

+			$x2 = $this->x;

+			$this->AddPage($this->CurOrientation, $this->CurPageFormat);

+			$this->x = $x2;

 		}

-		$y=$this->y;

-		$this->y+=$h;

+		$y = $this->y;

+		$this->y += $h;

 	}

-	if($x===null)

-		$x=$this->x;

-	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));

-	if($link)

-		$this->Link($x,$y,$w,$h,$link);

+	if ($x === null)

+		$x = $this->x;

+	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));

+	if ($link)

+		$this->Link($x, $y, $w, $h, $link);

 }

 

 function GetX()

@@ -960,10 +960,10 @@ 
 function SetX($x)

 {

 	//Set x position

-	if($x>=0)

-		$this->x=$x;

+	if ($x >= 0)

+		$this->x = $x;

 	else

-		$this->x=$this->w+$x;

+		$this->x = $this->w + $x;

 }

 

 function GetY()

@@ -975,11 +975,11 @@ 
 function SetY($y)

 {

 	//Set y position and reset x

-	$this->x=$this->lMargin;

-	if($y>=0)

-		$this->y=$y;

+	$this->x = $this->lMargin;

+	if ($y >= 0)

+		$this->y = $y;

 	else

-		$this->y=$this->h+$y;

+		$this->y = $this->h + $y;

 }

 

 function SetXY($x, $y)

@@ -989,62 +989,62 @@ 
 	$this->SetX($x);

 }

 

-function Output($name='', $dest='')

+function Output($name = '', $dest = '')

 {

 	//Output PDF to some destination

-	if($this->state<3)

+	if ($this->state < 3)

 		$this->Close();

-	$dest=strtoupper($dest);

-	if($dest=='')

+	$dest = strtoupper($dest);

+	if ($dest == '')

 	{

-		if($name=='')

+		if ($name == '')

 		{

-			$name='doc.pdf';

-			$dest='I';

+			$name = 'doc.pdf';

+			$dest = 'I';

 		}

 		else

-			$dest='F';

+			$dest = 'F';

 	}

-	switch($dest)

+	switch ($dest)

 	{

 		case 'I':

 			//Send to standard output

-			if(ob_get_length())

+			if (ob_get_length())

 				$this->Error('Some data has already been output, can\'t send PDF file');

-			if(php_sapi_name()!='cli')

+			if (php_sapi_name() != 'cli')

 			{

 				//We send to a browser

 				header('Content-Type: application/pdf');

-				if(headers_sent())

+				if (headers_sent())

 					$this->Error('Some data has already been output, can\'t send PDF file');

 				header('Content-Length: '.strlen($this->buffer));

 				header('Content-Disposition: inline; filename="'.$name.'"');

 				header('Cache-Control: private, max-age=0, must-revalidate');

 				header('Pragma: public');

-				ini_set('zlib.output_compression','0');

+				ini_set('zlib.output_compression', '0');

 			}

 			echo $this->buffer;

 			break;

 		case 'D':

 			//Download file

-			if(ob_get_length())

+			if (ob_get_length())

 				$this->Error('Some data has already been output, can\'t send PDF file');

 			header('Content-Type: application/x-download');

-			if(headers_sent())

+			if (headers_sent())

 				$this->Error('Some data has already been output, can\'t send PDF file');

 			header('Content-Length: '.strlen($this->buffer));

 			header('Content-Disposition: attachment; filename="'.$name.'"');

 			header('Cache-Control: private, max-age=0, must-revalidate');

 			header('Pragma: public');

-			ini_set('zlib.output_compression','0');

+			ini_set('zlib.output_compression', '0');

 			echo $this->buffer;

 			break;

 		case 'F':

 			//Save to local file

-			$f=fopen($name,'wb');

-			if(!$f)

+			$f = fopen($name, 'wb');

+			if (!$f)

 				$this->Error('Unable to create output file: '.$name);

-			fwrite($f,$this->buffer,strlen($this->buffer));

+			fwrite($f, $this->buffer, strlen($this->buffer));

 			fclose($f);

 			break;

 		case 'S':

@@ -1064,87 +1064,87 @@ 
 function _dochecks()

 {

 	//Check availability of %F

-	if(sprintf('%.1F',1.0)!='1.0')

+	if (sprintf('%.1F', 1.0) != '1.0')

 		$this->Error('This version of PHP is not supported');

 	//Check mbstring overloading

-	if(ini_get('mbstring.func_overload') & 2)

+	if (ini_get('mbstring.func_overload') & 2)

 		$this->Error('mbstring overloading must be disabled');

 	//Disable runtime magic quotes

-	if(get_magic_quotes_runtime())

+	if (get_magic_quotes_runtime())

 		@set_magic_quotes_runtime(0);

 }

 

 function _getpageformat($format)

 {

-	$format=strtolower($format);

-	if(!isset($this->PageFormats[$format]))

+	$format = strtolower($format);

+	if (!isset($this->PageFormats[$format]))

 		$this->Error('Unknown page format: '.$format);

-	$a=$this->PageFormats[$format];

-	return array($a[0]/$this->k, $a[1]/$this->k);

+	$a = $this->PageFormats[$format];

+	return array($a[0] / $this->k, $a[1] / $this->k);

 }

 

 function _getfontpath()

 {

-	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))

-		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');

+	if (!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))

+		define('FPDF_FONTPATH', dirname(__FILE__).'/font/');

 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';

 }

 

 function _beginpage($orientation, $format)

 {

 	$this->page++;

-	$this->pages[$this->page]='';

-	$this->state=2;

-	$this->x=$this->lMargin;

-	$this->y=$this->tMargin;

-	$this->FontFamily='';

+	$this->pages[$this->page] = '';

+	$this->state = 2;

+	$this->x = $this->lMargin;

+	$this->y = $this->tMargin;

+	$this->FontFamily = '';

 	//Check page size

-	if($orientation=='')

-		$orientation=$this->DefOrientation;

+	if ($orientation == '')

+		$orientation = $this->DefOrientation;

 	else

-		$orientation=strtoupper($orientation[0]);

-	if($format=='')

-		$format=$this->DefPageFormat;

+		$orientation = strtoupper($orientation[0]);

+	if ($format == '')

+		$format = $this->DefPageFormat;

 	else

 	{

-		if(is_string($format))

-			$format=$this->_getpageformat($format);

+		if (is_string($format))

+			$format = $this->_getpageformat($format);

 	}

-	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])

+	if ($orientation != $this->CurOrientation || $format[0] != $this->CurPageFormat[0] || $format[1] != $this->CurPageFormat[1])

 	{

 		//New size

-		if($orientation=='P')

+		if ($orientation == 'P')

 		{

-			$this->w=$format[0];

-			$this->h=$format[1];

+			$this->w = $format[0];

+			$this->h = $format[1];

 		}

 		else

 		{

-			$this->w=$format[1];

-			$this->h=$format[0];

+			$this->w = $format[1];

+			$this->h = $format[0];

 		}

-		$this->wPt=$this->w*$this->k;

-		$this->hPt=$this->h*$this->k;

-		$this->PageBreakTrigger=$this->h-$this->bMargin;

-		$this->CurOrientation=$orientation;

-		$this->CurPageFormat=$format;

+		$this->wPt = $this->w * $this->k;

+		$this->hPt = $this->h * $this->k;

+		$this->PageBreakTrigger = $this->h - $this->bMargin;

+		$this->CurOrientation = $orientation;

+		$this->CurPageFormat = $format;

 	}

-	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])

-		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);

+	if ($orientation != $this->DefOrientation || $format[0] != $this->DefPageFormat[0] || $format[1] != $this->DefPageFormat[1])

+		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);

 }

 

 function _endpage()

 {

-	$this->state=1;

+	$this->state = 1;

 }

 

 function _escape($s)

 {

 	//Escape special characters in strings

-	$s=str_replace('\\','\\\\',$s);

-	$s=str_replace('(','\\(',$s);

-	$s=str_replace(')','\\)',$s);

-	$s=str_replace("\r",'\\r',$s);

+	$s = str_replace('\\', '\\\\', $s);

+	$s = str_replace('(', '\\(', $s);

+	$s = str_replace(')', '\\)', $s);

+	$s = str_replace("\r", '\\r', $s);

 	return $s;

 }

 

@@ -1157,31 +1157,31 @@ 
 function _UTF8toUTF16($s)

 {

 	//Convert UTF-8 to UTF-16BE with BOM

-	$res="\xFE\xFF";

-	$nb=strlen($s);

-	$i=0;

-	while($i<$nb)

+	$res = "\xFE\xFF";

+	$nb = strlen($s);

+	$i = 0;

+	while ($i < $nb)

 	{

-		$c1=ord($s[$i++]);

-		if($c1>=224)

+		$c1 = ord($s[$i++]);

+		if ($c1 >= 224)

 		{

 			//3-byte character

-			$c2=ord($s[$i++]);

-			$c3=ord($s[$i++]);

-			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));

-			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));

+			$c2 = ord($s[$i++]);

+			$c3 = ord($s[$i++]);

+			$res .= chr((($c1 & 0x0F) << 4) + (($c2 & 0x3C) >> 2));

+			$res .= chr((($c2 & 0x03) << 6) + ($c3 & 0x3F));

 		}

-		elseif($c1>=192)

+		elseif ($c1 >= 192)

 		{

 			//2-byte character

-			$c2=ord($s[$i++]);

-			$res.=chr(($c1 & 0x1C)>>2);

-			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));

+			$c2 = ord($s[$i++]);

+			$res .= chr(($c1 & 0x1C) >> 2);

+			$res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F));

 		}

 		else

 		{

 			//Single-byte character

-			$res.="\0".chr($c1);

+			$res .= "\0".chr($c1);

 		}

 	}

 	return $res;

@@ -1190,32 +1190,32 @@ 
 function _dounderline($x, $y, $txt)

 {

 	//Underline text

-	$up=$this->CurrentFont['up'];

-	$ut=$this->CurrentFont['ut'];

-	$w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');

-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);

+	$up = $this->CurrentFont['up'];

+	$ut = $this->CurrentFont['ut'];

+	$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt, ' ');

+	return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);

 }

 

 function _parsejpg($file)

 {

 	//Extract info from a JPEG file

-	$a=GetImageSize($file);

-	if(!$a)

+	$a = GetImageSize($file);

+	if (!$a)

 		$this->Error('Missing or incorrect image file: '.$file);

-	if($a[2]!=2)

+	if ($a[2] != 2)

 		$this->Error('Not a JPEG file: '.$file);

-	if(!isset($a['channels']) || $a['channels']==3)

-		$colspace='DeviceRGB';

-	elseif($a['channels']==4)

-		$colspace='DeviceCMYK';

+	if (!isset($a['channels']) || $a['channels'] == 3)

+		$colspace = 'DeviceRGB';

+	elseif ($a['channels'] == 4)

+		$colspace = 'DeviceCMYK';

 	else

-		$colspace='DeviceGray';

-	$bpc=isset($a['bits']) ? $a['bits'] : 8;

+		$colspace = 'DeviceGray';

+	$bpc = isset($a['bits']) ? $a['bits'] : 8;

 	//Read whole file

-	$f=fopen($file,'rb');

-	$data='';

-	while(!feof($f))

-		$data.=fread($f,8192);

+	$f = fopen($file, 'rb');

+	$data = '';

+	while (!feof($f))

+		$data .= fread($f, 8192);

 	fclose($f);

 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);

 }

@@ -1223,81 +1223,81 @@ 
 function _parsepng($file)

 {

 	//Extract info from a PNG file

-	$f=fopen($file,'rb');

-	if(!$f)

+	$f = fopen($file, 'rb');

+	if (!$f)

 		$this->Error('Can\'t open image file: '.$file);

 	//Check signature

-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

+	if ($this->_readstream($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

 		$this->Error('Not a PNG file: '.$file);

 	//Read header chunk

-	$this->_readstream($f,4);

-	if($this->_readstream($f,4)!='IHDR')

+	$this->_readstream($f, 4);

+	if ($this->_readstream($f, 4) != 'IHDR')

 		$this->Error('Incorrect PNG file: '.$file);

-	$w=$this->_readint($f);

-	$h=$this->_readint($f);

-	$bpc=ord($this->_readstream($f,1));

-	if($bpc>8)

+	$w = $this->_readint($f);

+	$h = $this->_readint($f);

+	$bpc = ord($this->_readstream($f, 1));

+	if ($bpc > 8)

 		$this->Error('16-bit depth not supported: '.$file);

-	$ct=ord($this->_readstream($f,1));

-	if($ct==0)

-		$colspace='DeviceGray';

-	elseif($ct==2)

-		$colspace='DeviceRGB';

-	elseif($ct==3)

-		$colspace='Indexed';

+	$ct = ord($this->_readstream($f, 1));

+	if ($ct == 0)

+		$colspace = 'DeviceGray';

+	elseif ($ct == 2)

+		$colspace = 'DeviceRGB';

+	elseif ($ct == 3)

+		$colspace = 'Indexed';

 	else

 		$this->Error('Alpha channel not supported: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Unknown compression method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Unknown filter method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Interlacing not supported: '.$file);

-	$this->_readstream($f,4);

-	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';

+	$this->_readstream($f, 4);

+	$parms = '/DecodeParms <</Predictor 15 /Colors '.($ct == 2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';

 	//Scan chunks looking for palette, transparency and image data

-	$pal='';

-	$trns='';

-	$data='';

+	$pal = '';

+	$trns = '';

+	$data = '';

 	do

 	{

-		$n=$this->_readint($f);

-		$type=$this->_readstream($f,4);

-		if($type=='PLTE')

+		$n = $this->_readint($f);

+		$type = $this->_readstream($f, 4);

+		if ($type == 'PLTE')

 		{

 			//Read palette

-			$pal=$this->_readstream($f,$n);

-			$this->_readstream($f,4);

+			$pal = $this->_readstream($f, $n);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='tRNS')

+		elseif ($type == 'tRNS')

 		{

 			//Read transparency info

-			$t=$this->_readstream($f,$n);

-			if($ct==0)

-				$trns=array(ord(substr($t,1,1)));

-			elseif($ct==2)

-				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));

+			$t = $this->_readstream($f, $n);

+			if ($ct == 0)

+				$trns = array(ord(substr($t, 1, 1)));

+			elseif ($ct == 2)

+				$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));

 			else

 			{

-				$pos=strpos($t,chr(0));

-				if($pos!==false)

-					$trns=array($pos);

+				$pos = strpos($t, chr(0));

+				if ($pos !== false)

+					$trns = array($pos);

 			}

-			$this->_readstream($f,4);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='IDAT')

+		elseif ($type == 'IDAT')

 		{

 			//Read image data block

-			$data.=$this->_readstream($f,$n);

-			$this->_readstream($f,4);

+			$data .= $this->_readstream($f, $n);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='IEND')

+		elseif ($type == 'IEND')

 			break;

 		else

-			$this->_readstream($f,$n+4);

+			$this->_readstream($f, $n + 4);

 	}

-	while($n);

-	if($colspace=='Indexed' && empty($pal))

+	while ($n);

+	if ($colspace == 'Indexed' && empty($pal))

 		$this->Error('Missing palette in '.$file);

 	fclose($f);

 	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);

@@ -1306,16 +1306,16 @@ 
 function _readstream($f, $n)

 {

 	//Read n bytes from stream

-	$res='';

-	while($n>0 && !feof($f))

+	$res = '';

+	while ($n > 0 && !feof($f))

 	{

-		$s=fread($f,$n);

-		if($s===false)

+		$s = fread($f, $n);

+		if ($s === false)

 			$this->Error('Error while reading stream');

-		$n-=strlen($s);

-		$res.=$s;

+		$n -= strlen($s);

+		$res .= $s;

 	}

-	if($n>0)

+	if ($n > 0)

 		$this->Error('Unexpected end of stream');

 	return $res;

 }

@@ -1323,28 +1323,28 @@ 
 function _readint($f)

 {

 	//Read a 4-byte integer from stream

-	$a=unpack('Ni',$this->_readstream($f,4));

+	$a = unpack('Ni', $this->_readstream($f, 4));

 	return $a['i'];

 }

 

 function _parsegif($file)

 {

 	//Extract info from a GIF file (via PNG conversion)

-	if(!function_exists('imagepng'))

+	if (!function_exists('imagepng'))

 		$this->Error('GD extension is required for GIF support');

-	if(!function_exists('imagecreatefromgif'))

+	if (!function_exists('imagecreatefromgif'))

 		$this->Error('GD has no GIF read support');

-	$im=imagecreatefromgif($file);

-	if(!$im)

+	$im = imagecreatefromgif($file);

+	if (!$im)

 		$this->Error('Missing or incorrect image file: '.$file);

-	imageinterlace($im,0);

-	$tmp=tempnam('.','gif');

-	if(!$tmp)

+	imageinterlace($im, 0);

+	$tmp = tempnam('.', 'gif');

+	if (!$tmp)

 		$this->Error('Unable to create a temporary file');

-	if(!imagepng($im,$tmp))

+	if (!imagepng($im, $tmp))

 		$this->Error('Error while saving to temporary file');

 	imagedestroy($im);

-	$info=$this->_parsepng($tmp);

+	$info = $this->_parsepng($tmp);

 	unlink($tmp);

 	return $info;

 }

@@ -1353,7 +1353,7 @@ 
 {

 	//Begin a new object

 	$this->n++;

-	$this->offsets[$this->n]=strlen($this->buffer);

+	$this->offsets[$this->n] = strlen($this->buffer);

 	$this->_out($this->n.' 0 obj');

 }

 

@@ -1367,149 +1367,149 @@ 
 function _out($s)

 {

 	//Add a line to the document

-	if($this->state==2)

-		$this->pages[$this->page].=$s."\n";

+	if ($this->state == 2)

+		$this->pages[$this->page] .= $s."\n";

 	else

-		$this->buffer.=$s."\n";

+		$this->buffer .= $s."\n";

 }

 

 function _putpages()

 {

-	$nb=$this->page;

-	if(!empty($this->AliasNbPages))

+	$nb = $this->page;

+	if (!empty($this->AliasNbPages))

 	{

 		//Replace number of pages

-		for($n=1;$n<=$nb;$n++)

-			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);

+		for ($n = 1; $n <= $nb; $n++)

+			$this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);

 	}

-	if($this->DefOrientation=='P')

+	if ($this->DefOrientation == 'P')

 	{

-		$wPt=$this->DefPageFormat[0]*$this->k;

-		$hPt=$this->DefPageFormat[1]*$this->k;

+		$wPt = $this->DefPageFormat[0] * $this->k;

+		$hPt = $this->DefPageFormat[1] * $this->k;

 	}

 	else

 	{

-		$wPt=$this->DefPageFormat[1]*$this->k;

-		$hPt=$this->DefPageFormat[0]*$this->k;

+		$wPt = $this->DefPageFormat[1] * $this->k;

+		$hPt = $this->DefPageFormat[0] * $this->k;

 	}

-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';

-	for($n=1;$n<=$nb;$n++)

+	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';

+	for ($n = 1; $n <= $nb; $n++)

 	{

 		//Page

 		$this->_newobj();

 		$this->_out('<</Type /Page');

 		$this->_out('/Parent 1 0 R');

-		if(isset($this->PageSizes[$n]))

-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));

+		if (isset($this->PageSizes[$n]))

+			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));

 		$this->_out('/Resources 2 0 R');

-		if(isset($this->PageLinks[$n]))

+		if (isset($this->PageLinks[$n]))

 		{

 			//Links

-			$annots='/Annots [';

-			foreach($this->PageLinks[$n] as $pl)

+			$annots = '/Annots [';

+			foreach ($this->PageLinks[$n] as $pl)

 			{

-				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);

-				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';

-				if(is_string($pl[4]))

-					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

+				$rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);

+				$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';

+				if (is_string($pl[4]))

+					$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

 				else

 				{

-					$l=$this->links[$pl[4]];

-					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;

-					$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);

+					$l = $this->links[$pl[4]];

+					$h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;

+					$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', 1 + 2 * $l[0], $h - $l[1] * $this->k);

 				}

 			}

 			$this->_out($annots.']');

 		}

-		$this->_out('/Contents '.($this->n+1).' 0 R>>');

+		$this->_out('/Contents '.($this->n + 1).' 0 R>>');

 		$this->_out('endobj');

 		//Page content

-		$p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];

+		$p = ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];

 		$this->_newobj();

 		$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');

 		$this->_putstream($p);

 		$this->_out('endobj');

 	}

 	//Pages root

-	$this->offsets[1]=strlen($this->buffer);

+	$this->offsets[1] = strlen($this->buffer);

 	$this->_out('1 0 obj');

 	$this->_out('<</Type /Pages');

-	$kids='/Kids [';

-	for($i=0;$i<$nb;$i++)

-		$kids.=(3+2*$i).' 0 R ';

+	$kids = '/Kids [';

+	for ($i = 0; $i < $nb; $i++)

+		$kids .= (3 + 2 * $i).' 0 R ';

 	$this->_out($kids.']');

 	$this->_out('/Count '.$nb);

-	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));

+	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));

 	$this->_out('>>');

 	$this->_out('endobj');

 }

 

 function _putfonts()

 {

-	$nf=$this->n;

-	foreach($this->diffs as $diff)

+	$nf = $this->n;

+	foreach ($this->diffs as $diff)

 	{

 		//Encodings

 		$this->_newobj();

 		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');

 		$this->_out('endobj');

 	}

-	foreach($this->FontFiles as $file=>$info)

+	foreach ($this->FontFiles as $file=>$info)

 	{

 		//Font file embedding

 		$this->_newobj();

-		$this->FontFiles[$file]['n']=$this->n;

-		$font='';

-		$f=fopen($this->_getfontpath().$file,'rb',1);

-		if(!$f)

+		$this->FontFiles[$file]['n'] = $this->n;

+		$font = '';

+		$f = fopen($this->_getfontpath().$file, 'rb', 1);

+		if (!$f)

 			$this->Error('Font file not found');

-		while(!feof($f))

-			$font.=fread($f,8192);

+		while (!feof($f))

+			$font .= fread($f, 8192);

 		fclose($f);

-		$compressed=(substr($file,-2)=='.z');

-		if(!$compressed && isset($info['length2']))

+		$compressed = (substr($file, -2) == '.z');

+		if (!$compressed && isset($info['length2']))

 		{

-			$header=(ord($font[0])==128);

-			if($header)

+			$header = (ord($font[0]) == 128);

+			if ($header)

 			{

 				//Strip first binary header

-				$font=substr($font,6);

+				$font = substr($font, 6);

 			}

-			if($header && ord($font[$info['length1']])==128)

+			if ($header && ord($font[$info['length1']]) == 128)

 			{

 				//Strip second binary header

-				$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);

+				$font = substr($font, 0, $info['length1']).substr($font, $info['length1'] + 6);

 			}

 		}

 		$this->_out('<</Length '.strlen($font));

-		if($compressed)

+		if ($compressed)

 			$this->_out('/Filter /FlateDecode');

 		$this->_out('/Length1 '.$info['length1']);

-		if(isset($info['length2']))

+		if (isset($info['length2']))

 			$this->_out('/Length2 '.$info['length2'].' /Length3 0');

 		$this->_out('>>');

 		$this->_putstream($font);

 		$this->_out('endobj');

 	}

-	foreach($this->fonts as $k=>$font)

+	foreach ($this->fonts as $k=>$font)

 	{

 		//Font objects

-		$this->fonts[$k]['n']=$this->n+1;

-		$type=$font['type'];

-		$name=$font['name'];

-		if($type=='core')

+		$this->fonts[$k]['n'] = $this->n + 1;

+		$type = $font['type'];

+		$name = $font['name'];

+		if ($type == 'core')

 		{

 			//Standard font

 			$this->_newobj();

 			$this->_out('<</Type /Font');

 			$this->_out('/BaseFont /'.$name);

 			$this->_out('/Subtype /Type1');

-			if($name!='Symbol' && $name!='ZapfDingbats')

+			if ($name != 'Symbol' && $name != 'ZapfDingbats')

 				$this->_out('/Encoding /WinAnsiEncoding');

 			$this->_out('>>');

 			$this->_out('endobj');

 		}

-		elseif($type=='Type1' || $type=='TrueType')

+		elseif ($type == 'Type1' || $type == 'TrueType')

 		{

 			//Additional Type1 or TrueType font

 			$this->_newobj();

@@ -1517,12 +1517,12 @@ 
 			$this->_out('/BaseFont /'.$name);

 			$this->_out('/Subtype /'.$type);

 			$this->_out('/FirstChar 32 /LastChar 255');

-			$this->_out('/Widths '.($this->n+1).' 0 R');

-			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');

-			if($font['enc'])

+			$this->_out('/Widths '.($this->n + 1).' 0 R');

+			$this->_out('/FontDescriptor '.($this->n + 2).' 0 R');

+			if ($font['enc'])

 			{

-				if(isset($font['diff']))

-					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');

+				if (isset($font['diff']))

+					$this->_out('/Encoding '.($nf + $font['diff']).' 0 R');

 				else

 					$this->_out('/Encoding /WinAnsiEncoding');

 			}

@@ -1530,28 +1530,28 @@ 
 			$this->_out('endobj');

 			//Widths

 			$this->_newobj();

-			$cw=&$font['cw'];

-			$s='[';

-			for($i=32;$i<=255;$i++)

-				$s.=$cw[chr($i)].' ';

+			$cw = &$font['cw'];

+			$s = '[';

+			for ($i = 32; $i <= 255; $i++)

+				$s .= $cw[chr($i)].' ';

 			$this->_out($s.']');

 			$this->_out('endobj');

 			//Descriptor

 			$this->_newobj();

-			$s='<</Type /FontDescriptor /FontName /'.$name;

-			foreach($font['desc'] as $k=>$v)

-				$s.=' /'.$k.' '.$v;

-			$file=$font['file'];

-			if($file)

-				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';

+			$s = '<</Type /FontDescriptor /FontName /'.$name;

+			foreach ($font['desc'] as $k=>$v)

+				$s .= ' /'.$k.' '.$v;

+			$file = $font['file'];

+			if ($file)

+				$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';

 			$this->_out($s.'>>');

 			$this->_out('endobj');

 		}

 		else

 		{

 			//Allow for additional types

-			$mtd='_put'.strtolower($type);

-			if(!method_exists($this,$mtd))

+			$mtd = '_put'.strtolower($type);

+			if (!method_exists($this, $mtd))

 				$this->Error('Unsupported font type: '.$type);

 			$this->$mtd($font);

 		}

@@ -1560,34 +1560,34 @@ 
 

 function _putimages()

 {

-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';

+	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';

 	reset($this->images);

-	while(list($file,$info)=each($this->images))

+	while (list($file, $info) = each($this->images))

 	{

 		$this->_newobj();

-		$this->images[$file]['n']=$this->n;

+		$this->images[$file]['n'] = $this->n;

 		$this->_out('<</Type /XObject');

 		$this->_out('/Subtype /Image');

 		$this->_out('/Width '.$info['w']);

 		$this->_out('/Height '.$info['h']);

-		if($info['cs']=='Indexed')

-			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');

+		if ($info['cs'] == 'Indexed')

+			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');

 		else

 		{

 			$this->_out('/ColorSpace /'.$info['cs']);

-			if($info['cs']=='DeviceCMYK')

+			if ($info['cs'] == 'DeviceCMYK')

 				$this->_out('/Decode [1 0 1 0 1 0 1 0]');

 		}

 		$this->_out('/BitsPerComponent '.$info['bpc']);

-		if(isset($info['f']))

+		if (isset($info['f']))

 			$this->_out('/Filter /'.$info['f']);

-		if(isset($info['parms']))

+		if (isset($info['parms']))

 			$this->_out($info['parms']);

-		if(isset($info['trns']) && is_array($info['trns']))

+		if (isset($info['trns']) && is_array($info['trns']))

 		{

-			$trns='';

-			for($i=0;$i<count($info['trns']);$i++)

-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';

+			$trns = '';

+			for ($i = 0; $i < count($info['trns']); $i++)

+				$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';

 			$this->_out('/Mask ['.$trns.']');

 		}

 		$this->_out('/Length '.strlen($info['data']).'>>');

@@ -1595,10 +1595,10 @@ 
 		unset($this->images[$file]['data']);

 		$this->_out('endobj');

 		//Palette

-		if($info['cs']=='Indexed')

+		if ($info['cs'] == 'Indexed')

 		{

 			$this->_newobj();

-			$pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];

+			$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];

 			$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');

 			$this->_putstream($pal);

 			$this->_out('endobj');

@@ -1608,7 +1608,7 @@ 
 

 function _putxobjectdict()

 {

-	foreach($this->images as $image)

+	foreach ($this->images as $image)

 		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');

 }

 

@@ -1616,7 +1616,7 @@ 
 {

 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');

 	$this->_out('/Font <<');

-	foreach($this->fonts as $font)

+	foreach ($this->fonts as $font)

 		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');

 	$this->_out('>>');

 	$this->_out('/XObject <<');

@@ -1629,7 +1629,7 @@ 
 	$this->_putfonts();

 	$this->_putimages();

 	//Resource dictionary

-	$this->offsets[2]=strlen($this->buffer);

+	$this->offsets[2] = strlen($this->buffer);

 	$this->_out('2 0 obj');

 	$this->_out('<<');

 	$this->_putresourcedict();

@@ -1640,15 +1640,15 @@ 
 function _putinfo()

 {

 	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));

-	if(!empty($this->title))

+	if (!empty($this->title))

 		$this->_out('/Title '.$this->_textstring($this->title));

-	if(!empty($this->subject))

+	if (!empty($this->subject))

 		$this->_out('/Subject '.$this->_textstring($this->subject));

-	if(!empty($this->author))

+	if (!empty($this->author))

 		$this->_out('/Author '.$this->_textstring($this->author));

-	if(!empty($this->keywords))

+	if (!empty($this->keywords))

 		$this->_out('/Keywords '.$this->_textstring($this->keywords));

-	if(!empty($this->creator))

+	if (!empty($this->creator))

 		$this->_out('/Creator '.$this->_textstring($this->creator));

 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

@@ -1657,19 +1657,19 @@ 
 {

 	$this->_out('/Type /Catalog');

 	$this->_out('/Pages 1 0 R');

-	if($this->ZoomMode=='fullpage')

+	if ($this->ZoomMode == 'fullpage')

 		$this->_out('/OpenAction [3 0 R /Fit]');

-	elseif($this->ZoomMode=='fullwidth')

+	elseif ($this->ZoomMode == 'fullwidth')

 		$this->_out('/OpenAction [3 0 R /FitH null]');

-	elseif($this->ZoomMode=='real')

+	elseif ($this->ZoomMode == 'real')

 		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');

-	elseif(!is_string($this->ZoomMode))

-		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');

-	if($this->LayoutMode=='single')

+	elseif (!is_string($this->ZoomMode))

+		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode / 100).']');

+	if ($this->LayoutMode == 'single')

 		$this->_out('/PageLayout /SinglePage');

-	elseif($this->LayoutMode=='continuous')

+	elseif ($this->LayoutMode == 'continuous')

 		$this->_out('/PageLayout /OneColumn');

-	elseif($this->LayoutMode=='two')

+	elseif ($this->LayoutMode == 'two')

 		$this->_out('/PageLayout /TwoColumnLeft');

 }

 

@@ -1680,9 +1680,9 @@ 
 

 function _puttrailer()

 {

-	$this->_out('/Size '.($this->n+1));

+	$this->_out('/Size '.($this->n + 1));

 	$this->_out('/Root '.$this->n.' 0 R');

-	$this->_out('/Info '.($this->n-1).' 0 R');

+	$this->_out('/Info '.($this->n - 1).' 0 R');

 }

 

 function _enddoc()

@@ -1703,12 +1703,12 @@ 
 	$this->_out('>>');

 	$this->_out('endobj');

 	//Cross-ref

-	$o=strlen($this->buffer);

+	$o = strlen($this->buffer);

 	$this->_out('xref');

-	$this->_out('0 '.($this->n+1));

+	$this->_out('0 '.($this->n + 1));

 	$this->_out('0000000000 65535 f ');

-	for($i=1;$i<=$this->n;$i++)

-		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));

+	for ($i = 1; $i <= $this->n; $i++)

+		$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));

 	//Trailer

 	$this->_out('trailer');

 	$this->_out('<<');

@@ -1717,13 +1717,13 @@ 
 	$this->_out('startxref');

 	$this->_out($o);

 	$this->_out('%%EOF');

-	$this->state=3;

+	$this->state = 3;

 }

 //End of class

 }

 

 //Handle special IE contype request

-if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')

+if (isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'contype')

 {

 	header('Content-Type: application/pdf');

 	exit;

Braces +562 added lines, -432 removed lines

@@ -106,21 +106,23 @@ 
 		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',

 		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');

 	//Scale factor

-	if($unit=='pt')

-		$this->k=1;

-	elseif($unit=='mm')

-		$this->k=72/25.4;

-	elseif($unit=='cm')

-		$this->k=72/2.54;

-	elseif($unit=='in')

-		$this->k=72;

-	else

-		$this->Error('Incorrect unit: '.$unit);

+	if($unit=='pt') {

+			$this->k=1;

+	} elseif($unit=='mm') {

+			$this->k=72/25.4;

+	} elseif($unit=='cm') {

+			$this->k=72/2.54;

+	} elseif($unit=='in') {

+			$this->k=72;

+	} else {

+			$this->Error('Incorrect unit: '.$unit);

+	}

 	//Page format

 	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),

 		'letter'=>array(612,792), 'legal'=>array(612,1008));

-	if(is_string($format))

-		$format=$this->_getpageformat($format);

+	if(is_string($format)) {

+			$format=$this->_getpageformat($format);

+	}

 	$this->DefPageFormat=$format;

 	$this->CurPageFormat=$format;

 	//Page orientation

@@ -130,15 +132,14 @@ 
 		$this->DefOrientation='P';

 		$this->w=$this->DefPageFormat[0];

 		$this->h=$this->DefPageFormat[1];

-	}

-	elseif($orientation=='l' || $orientation=='landscape')

+	} elseif($orientation=='l' || $orientation=='landscape')

 	{

 		$this->DefOrientation='L';

 		$this->w=$this->DefPageFormat[1];

 		$this->h=$this->DefPageFormat[0];

+	} else {

+			$this->Error('Incorrect orientation: '.$orientation);

 	}

-	else

-		$this->Error('Incorrect orientation: '.$orientation);

 	$this->CurOrientation=$this->DefOrientation;

 	$this->wPt=$this->w*$this->k;

 	$this->hPt=$this->h*$this->k;

@@ -164,8 +165,9 @@ 
 	//Set left, top and right margins

 	$this->lMargin=$left;

 	$this->tMargin=$top;

-	if($right===null)

-		$right=$left;

+	if($right===null) {

+			$right=$left;

+	}

 	$this->rMargin=$right;

 }

 

@@ -173,9 +175,10 @@ 
 {

 	//Set left margin

 	$this->lMargin=$margin;

-	if($this->page>0 && $this->x<$margin)

-		$this->x=$margin;

-}

+	if($this->page>0 && $this->x<$margin) {

+			$this->x=$margin;

+	}

+	}

 

 function SetTopMargin($margin)

 {

@@ -200,62 +203,70 @@ 
 function SetDisplayMode($zoom, $layout='continuous')

 {

 	//Set display mode in viewer

-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

-		$this->ZoomMode=$zoom;

-	else

-		$this->Error('Incorrect zoom display mode: '.$zoom);

-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

-		$this->LayoutMode=$layout;

-	else

-		$this->Error('Incorrect layout display mode: '.$layout);

-}

+	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {

+			$this->ZoomMode=$zoom;

+	} else {

+			$this->Error('Incorrect zoom display mode: '.$zoom);

+	}

+	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {

+			$this->LayoutMode=$layout;

+	} else {

+			$this->Error('Incorrect layout display mode: '.$layout);

+	}

+	}

 

 function SetCompression($compress)

 {

 	//Set page compression

-	if(function_exists('gzcompress'))

-		$this->compress=$compress;

-	else

-		$this->compress=false;

-}

+	if(function_exists('gzcompress')) {

+			$this->compress=$compress;

+	} else {

+			$this->compress=false;

+	}

+	}

 

 function SetTitle($title, $isUTF8=false)

 {

 	//Title of document

-	if($isUTF8)

-		$title=$this->_UTF8toUTF16($title);

+	if($isUTF8) {

+			$title=$this->_UTF8toUTF16($title);

+	}

 	$this->title=$title;

 }

 

 function SetSubject($subject, $isUTF8=false)

 {

 	//Subject of document

-	if($isUTF8)

-		$subject=$this->_UTF8toUTF16($subject);

+	if($isUTF8) {

+			$subject=$this->_UTF8toUTF16($subject);

+	}

 	$this->subject=$subject;

 }

 

 function SetAuthor($author, $isUTF8=false)

 {

 	//Author of document

-	if($isUTF8)

-		$author=$this->_UTF8toUTF16($author);

+	if($isUTF8) {

+			$author=$this->_UTF8toUTF16($author);

+	}

 	$this->author=$author;

 }

 

 function SetKeywords($keywords, $isUTF8=false)

 {

 	//Keywords of document

-	if($isUTF8)

-		$keywords=$this->_UTF8toUTF16($keywords);

+	if($isUTF8) {

+			$keywords=$this->_UTF8toUTF16($keywords);

+	}

 	$this->keywords=$keywords;

 }

 

 function SetCreator($creator, $isUTF8=false)

 {

 	//Creator of document

-	if($isUTF8)

-		$creator=$this->_UTF8toUTF16($creator);

+	if($isUTF8) {

+			$creator=$this->_UTF8toUTF16($creator);

+	}

 	$this->creator=$creator;

 }

 

@@ -280,10 +291,12 @@ 
 function Close()

 {

 	//Terminate document

-	if($this->state==3)

-		return;

-	if($this->page==0)

-		$this->AddPage();

+	if($this->state==3) {

+			return;

+	}

+	if($this->page==0) {

+			$this->AddPage();

+	}

 	//Page footer

 	$this->InFooter=true;

 	$this->Footer();

@@ -297,8 +310,9 @@ 
 function AddPage($orientation='', $format='')

 {

 	//Start a new page

-	if($this->state==0)

-		$this->Open();

+	if($this->state==0) {

+			$this->Open();

+	}

 	$family=$this->FontFamily;

 	$style=$this->FontStyle.($this->underline ? 'U' : '');

 	$size=$this->FontSizePt;

@@ -324,15 +338,18 @@ 
 	$this->LineWidth=$lw;

 	$this->_out(sprintf('%.2F w',$lw*$this->k));

 	//Set font

-	if($family)

-		$this->SetFont($family,$style,$size);

+	if($family) {

+			$this->SetFont($family,$style,$size);

+	}

 	//Set colors

 	$this->DrawColor=$dc;

-	if($dc!='0 G')

-		$this->_out($dc);

+	if($dc!='0 G') {

+			$this->_out($dc);

+	}

 	$this->FillColor=$fc;

-	if($fc!='0 g')

-		$this->_out($fc);

+	if($fc!='0 g') {

+			$this->_out($fc);

+	}

 	$this->TextColor=$tc;

 	$this->ColorFlag=$cf;

 	//Page header

@@ -346,8 +363,9 @@ 
 		$this->_out(sprintf('%.2F w',$lw*$this->k));

 	}

 	//Restore font

-	if($family)

-		$this->SetFont($family,$style,$size);

+	if($family) {

+			$this->SetFont($family,$style,$size);

+	}

 	//Restore colors

 	if($this->DrawColor!=$dc)

 	{

@@ -382,33 +400,38 @@ 
 function SetDrawColor($r, $g=null, $b=null)

 {

 	//Set color for all stroking operations

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->DrawColor=sprintf('%.3F G',$r/255);

-	else

-		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);

-	if($this->page>0)

-		$this->_out($this->DrawColor);

-}

+	if(($r==0 && $g==0 && $b==0) || $g===null) {

+			$this->DrawColor=sprintf('%.3F G',$r/255);

+	} else {

+			$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);

+	}

+	if($this->page>0) {

+			$this->_out($this->DrawColor);

+	}

+	}

 

 function SetFillColor($r, $g=null, $b=null)

 {

 	//Set color for all filling operations

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->FillColor=sprintf('%.3F g',$r/255);

-	else

-		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

+	if(($r==0 && $g==0 && $b==0) || $g===null) {

+			$this->FillColor=sprintf('%.3F g',$r/255);

+	} else {

+			$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

+	}

 	$this->ColorFlag=($this->FillColor!=$this->TextColor);

-	if($this->page>0)

-		$this->_out($this->FillColor);

-}

+	if($this->page>0) {

+			$this->_out($this->FillColor);

+	}

+	}

 

 function SetTextColor($r, $g=null, $b=null)

 {

 	//Set color for text

-	if(($r==0 && $g==0 && $b==0) || $g===null)

-		$this->TextColor=sprintf('%.3F g',$r/255);

-	else

-		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

+	if(($r==0 && $g==0 && $b==0) || $g===null) {

+			$this->TextColor=sprintf('%.3F g',$r/255);

+	} else {

+			$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);

+	}

 	$this->ColorFlag=($this->FillColor!=$this->TextColor);

 }

 

@@ -419,8 +442,9 @@ 
 	$cw=&$this->CurrentFont['cw'];

 	$w=0;

 	$l=strlen($s);

-	for($i=0;$i<$l;$i++)

-		$w+=$cw[$s[$i]];

+	for($i=0;$i<$l;$i++) {

+			$w+=$cw[$s[$i]];

+	}

 	return $w*$this->FontSize/1000;

 }

 

@@ -428,9 +452,10 @@ 
 {

 	//Set line width

 	$this->LineWidth=$width;

-	if($this->page>0)

-		$this->_out(sprintf('%.2F w',$width*$this->k));

-}

+	if($this->page>0) {

+			$this->_out(sprintf('%.2F w',$width*$this->k));

+	}

+	}

 

 function Line($x1, $y1, $x2, $y2)

 {

@@ -441,12 +466,13 @@ 
 function Rect($x, $y, $w, $h, $style='')

 {

 	//Draw a rectangle

-	if($style=='F')

-		$op='f';

-	elseif($style=='FD' || $style=='DF')

-		$op='B';

-	else

-		$op='S';

+	if($style=='F') {

+			$op='f';

+	} elseif($style=='FD' || $style=='DF') {

+			$op='B';

+	} else {

+			$op='S';

+	}

 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));

 }

 

@@ -454,19 +480,24 @@ 
 {

 	//Add a TrueType or Type1 font

 	$family=strtolower($family);

-	if($file=='')

-		$file=str_replace(' ','',$family).strtolower($style).'.php';

-	if($family=='arial')

-		$family='helvetica';

+	if($file=='') {

+			$file=str_replace(' ','',$family).strtolower($style).'.php';

+	}

+	if($family=='arial') {

+			$family='helvetica';

+	}

 	$style=strtoupper($style);

-	if($style=='IB')

-		$style='BI';

+	if($style=='IB') {

+			$style='BI';

+	}

 	$fontkey=$family.$style;

-	if(isset($this->fonts[$fontkey]))

-		return;

+	if(isset($this->fonts[$fontkey])) {

+			return;

+	}

 	include($this->_getfontpath().$file);

-	if(!isset($name))

-		$this->Error('Could not include font definition 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)

@@ -491,10 +522,11 @@ 
 	}

 	if($file)

 	{

-		if($type=='TrueType')

-			$this->FontFiles[$file]=array('length1'=>$originalsize);

-		else

-			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);

+		if($type=='TrueType') {

+					$this->FontFiles[$file]=array('length1'=>$originalsize);

+		} else {

+					$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);

+		}

 	}

 }

 

@@ -504,27 +536,32 @@ 
 	global $fpdf_charwidths;

 

 	$family=strtolower($family);

-	if($family=='')

-		$family=$this->FontFamily;

-	if($family=='arial')

-		$family='helvetica';

-	elseif($family=='symbol' || $family=='zapfdingbats')

-		$style='';

+	if($family=='') {

+			$family=$this->FontFamily;

+	}

+	if($family=='arial') {

+			$family='helvetica';

+	} elseif($family=='symbol' || $family=='zapfdingbats') {

+			$style='';

+	}

 	$style=strtoupper($style);

 	if(strpos($style,'U')!==false)

 	{

 		$this->underline=true;

 		$style=str_replace('U','',$style);

+	} else {

+			$this->underline=false;

+	}

+	if($style=='IB') {

+			$style='BI';

+	}

+	if($size==0) {

+			$size=$this->FontSizePt;

 	}

-	else

-		$this->underline=false;

-	if($style=='IB')

-		$style='BI';

-	if($size==0)

-		$size=$this->FontSizePt;

 	//Test if font is already selected

-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

-		return;

+	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {

+			return;

+	}

 	//Test if used for the first time

 	$fontkey=$family.$style;

 	if(!isset($this->fonts[$fontkey]))

@@ -536,19 +573,21 @@ 
 			{

 				//Load metric file

 				$file=$family;

-				if($family=='times' || $family=='helvetica')

-					$file.=strtolower($style);

+				if($family=='times' || $family=='helvetica') {

+									$file.=strtolower($style);

+				}

 				include($this->_getfontpath().$file.'.php');

-				if(!isset($fpdf_charwidths[$fontkey]))

-					$this->Error('Could not include font metric file');

+				if(!isset($fpdf_charwidths[$fontkey])) {

+									$this->Error('Could not include font metric file');

+				}

 			}

 			$i=count($this->fonts)+1;

 			$name=$this->CoreFonts[$fontkey];

 			$cw=$fpdf_charwidths[$fontkey];

 			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);

+		} else {

+					$this->Error('Undefined font: '.$family.' '.$style);

 		}

-		else

-			$this->Error('Undefined font: '.$family.' '.$style);

 	}

 	//Select it

 	$this->FontFamily=$family;

@@ -556,20 +595,23 @@ 
 	$this->FontSizePt=$size;

 	$this->FontSize=$size/$this->k;

 	$this->CurrentFont=&$this->fonts[$fontkey];

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

-}

+	if($this->page>0) {

+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	}

+	}

 

 function SetFontSize($size)

 {

 	//Set font size in points

-	if($this->FontSizePt==$size)

-		return;

+	if($this->FontSizePt==$size) {

+			return;

+	}

 	$this->FontSizePt=$size;

 	$this->FontSize=$size/$this->k;

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

-}

+	if($this->page>0) {

+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	}

+	}

 

 function AddLink()

 {

@@ -582,10 +624,12 @@ 
 function SetLink($link, $y=0, $page=-1)

 {

 	//Set destination of internal link

-	if($y==-1)

-		$y=$this->y;

-	if($page==-1)

-		$page=$this->page;

+	if($y==-1) {

+			$y=$this->y;

+	}

+	if($page==-1) {

+			$page=$this->page;

+	}

 	$this->links[$link]=array($page, $y);

 }

 

@@ -599,10 +643,12 @@ 
 {

 	//Output a string

 	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));

-	if($this->underline && $txt!='')

-		$s.=' '.$this->_dounderline($x,$y,$txt);

-	if($this->ColorFlag)

-		$s='q '.$this->TextColor.' '.$s.' Q';

+	if($this->underline && $txt!='') {

+			$s.=' '.$this->_dounderline($x,$y,$txt);

+	}

+	if($this->ColorFlag) {

+			$s='q '.$this->TextColor.' '.$s.' Q';

+	}

 	$this->_out($s);

 }

 

@@ -634,74 +680,89 @@ 
 			$this->_out(sprintf('%.3F Tw',$ws*$k));

 		}

 	}

-	if($w==0)

-		$w=$this->w-$this->rMargin-$this->x;

+	if($w==0) {

+			$w=$this->w-$this->rMargin-$this->x;

+	}

 	$s='';

 	if($fill || $border==1)

 	{

-		if($fill)

-			$op=($border==1) ? 'B' : 'f';

-		else

-			$op='S';

+		if($fill) {

+					$op=($border==1) ? 'B' : 'f';

+		} else {

+					$op='S';

+		}

 		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);

 	}

 	if(is_string($border))

 	{

 		$x=$this->x;

 		$y=$this->y;

-		if(strpos($border,'L')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

-		if(strpos($border,'T')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

-		if(strpos($border,'R')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

-		if(strpos($border,'B')!==false)

-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+		if(strpos($border,'L')!==false) {

+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

+		}

+		if(strpos($border,'T')!==false) {

+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

+		}

+		if(strpos($border,'R')!==false) {

+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+		}

+		if(strpos($border,'B')!==false) {

+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+		}

 	}

 	if($txt!=='')

 	{

-		if($align=='R')

-			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);

-		elseif($align=='C')

-			$dx=($w-$this->GetStringWidth($txt))/2;

-		else

-			$dx=$this->cMargin;

-		if($this->ColorFlag)

-			$s.='q '.$this->TextColor.' ';

+		if($align=='R') {

+					$dx=$w-$this->cMargin-$this->GetStringWidth($txt);

+		} elseif($align=='C') {

+					$dx=($w-$this->GetStringWidth($txt))/2;

+		} else {

+					$dx=$this->cMargin;

+		}

+		if($this->ColorFlag) {

+					$s.='q '.$this->TextColor.' ';

+		}

 		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));

 		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);

-		if($this->underline)

-			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-		if($this->ColorFlag)

-			$s.=' Q';

-		if($link)

-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);

-	}

-	if($s)

-		$this->_out($s);

+		if($this->underline) {

+					$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

+		}

+		if($this->ColorFlag) {

+					$s.=' Q';

+		}

+		if($link) {

+					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);

+		}

+	}

+	if($s) {

+			$this->_out($s);

+	}

 	$this->lasth=$h;

 	if($ln>0)

 	{

 		//Go to next line

 		$this->y+=$h;

-		if($ln==1)

-			$this->x=$this->lMargin;

+		if($ln==1) {

+					$this->x=$this->lMargin;

+		}

+	} else {

+			$this->x+=$w;

+	}

 	}

-	else

-		$this->x+=$w;

-}

 

 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)

 {

 	//Output text with automatic or explicit line breaks

 	$cw=&$this->CurrentFont['cw'];

-	if($w==0)

-		$w=$this->w-$this->rMargin-$this->x;

+	if($w==0) {

+			$w=$this->w-$this->rMargin-$this->x;

+	}

 	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

 	$s=str_replace("\r",'',$txt);

 	$nb=strlen($s);

-	if($nb>0 && $s[$nb-1]=="\n")

-		$nb--;

+	if($nb>0 && $s[$nb-1]=="\n") {

+			$nb--;

+	}

 	$b=0;

 	if($border)

 	{

@@ -710,14 +771,15 @@ 
 			$border='LTRB';

 			$b='LRT';

 			$b2='LR';

-		}

-		else

+		} else

 		{

 			$b2='';

-			if(strpos($border,'L')!==false)

-				$b2.='L';

-			if(strpos($border,'R')!==false)

-				$b2.='R';

+			if(strpos($border,'L')!==false) {

+							$b2.='L';

+			}

+			if(strpos($border,'R')!==false) {

+							$b2.='R';

+			}

 			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;

 		}

 	}

@@ -746,8 +808,9 @@ 
 			$l=0;

 			$ns=0;

 			$nl++;

-			if($border && $nl==2)

-				$b=$b2;

+			if($border && $nl==2) {

+							$b=$b2;

+			}

 			continue;

 		}

 		if($c==' ')

@@ -762,16 +825,16 @@ 
 			//Automatic line break

 			if($sep==-1)

 			{

-				if($i==$j)

-					$i++;

+				if($i==$j) {

+									$i++;

+				}

 				if($this->ws>0)

 				{

 					$this->ws=0;

 					$this->_out('0 Tw');

 				}

 				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

-			}

-			else

+			} else

 			{

 				if($align=='J')

 				{

@@ -786,11 +849,12 @@ 
 			$l=0;

 			$ns=0;

 			$nl++;

-			if($border && $nl==2)

-				$b=$b2;

+			if($border && $nl==2) {

+							$b=$b2;

+			}

+		} else {

+					$i++;

 		}

-		else

-			$i++;

 	}

 	//Last chunk

 	if($this->ws>0)

@@ -798,8 +862,9 @@ 
 		$this->ws=0;

 		$this->_out('0 Tw');

 	}

-	if($border && strpos($border,'B')!==false)

-		$b.='B';

+	if($border && strpos($border,'B')!==false) {

+			$b.='B';

+	}

 	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

 	$this->x=$this->lMargin;

 }

@@ -838,8 +903,9 @@ 
 			$nl++;

 			continue;

 		}

-		if($c==' ')

-			$sep=$i;

+		if($c==' ') {

+					$sep=$i;

+		}

 		$l+=$cw[$c];

 		if($l>$wmax)

 		{

@@ -857,11 +923,11 @@ 
 					$nl++;

 					continue;

 				}

-				if($i==$j)

-					$i++;

+				if($i==$j) {

+									$i++;

+				}

 				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);

-			}

-			else

+			} else

 			{

 				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);

 				$i=$sep+1;

@@ -876,24 +942,26 @@ 
 				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;

 			}

 			$nl++;

+		} else {

+					$i++;

 		}

-		else

-			$i++;

 	}

 	//Last chunk

-	if($i!=$j)

-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);

-}

+	if($i!=$j) {

+			$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);

+	}

+	}

 

 function Ln($h=null)

 {

 	//Line feed; default value is last cell height

 	$this->x=$this->lMargin;

-	if($h===null)

-		$this->y+=$this->lasth;

-	else

-		$this->y+=$h;

-}

+	if($h===null) {

+			$this->y+=$this->lasth;

+	} else {

+			$this->y+=$h;

+	}

+	}

 

 function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')

 {

@@ -904,33 +972,36 @@ 
 		if($type=='')

 		{

 			$pos=strrpos($file,'.');

-			if(!$pos)

-				$this->Error('Image file has no extension and no type was specified: '.$file);

+			if(!$pos) {

+							$this->Error('Image file has no extension and no type was specified: '.$file);

+			}

 			$type=substr($file,$pos+1);

 		}

 		$type=strtolower($type);

-		if($type=='jpeg')

-			$type='jpg';

+		if($type=='jpeg') {

+					$type='jpg';

+		}

 		$mtd='_parse'.$type;

-		if(!method_exists($this,$mtd))

-			$this->Error('Unsupported image type: '.$type);

+		if(!method_exists($this,$mtd)) {

+					$this->Error('Unsupported image type: '.$type);

+		}

 		$info=$this->$mtd($file);

 		$info['i']=count($this->images)+1;

 		$this->images[$file]=$info;

+	} else {

+			$info=$this->images[$file];

 	}

-	else

-		$info=$this->images[$file];

 	//Automatic width and height calculation if needed

 	if($w==0 && $h==0)

 	{

 		//Put image at 72 dpi

 		$w=$info['w']/$this->k;

 		$h=$info['h']/$this->k;

+	} elseif($w==0) {

+			$w=$h*$info['w']/$info['h'];

+	} elseif($h==0) {

+			$h=$w*$info['h']/$info['w'];

 	}

-	elseif($w==0)

-		$w=$h*$info['w']/$info['h'];

-	elseif($h==0)

-		$h=$w*$info['h']/$info['w'];

 	//Flowing mode

 	if($y===null)

 	{

@@ -944,12 +1015,14 @@ 
 		$y=$this->y;

 		$this->y+=$h;

 	}

-	if($x===null)

-		$x=$this->x;

+	if($x===null) {

+			$x=$this->x;

+	}

 	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));

-	if($link)

-		$this->Link($x,$y,$w,$h,$link);

-}

+	if($link) {

+			$this->Link($x,$y,$w,$h,$link);

+	}

+	}

 

 function GetX()

 {

@@ -960,11 +1033,12 @@ 
 function SetX($x)

 {

 	//Set x position

-	if($x>=0)

-		$this->x=$x;

-	else

-		$this->x=$this->w+$x;

-}

+	if($x>=0) {

+			$this->x=$x;

+	} else {

+			$this->x=$this->w+$x;

+	}

+	}

 

 function GetY()

 {

@@ -976,11 +1050,12 @@ 
 {

 	//Set y position and reset x

 	$this->x=$this->lMargin;

-	if($y>=0)

-		$this->y=$y;

-	else

-		$this->y=$this->h+$y;

-}

+	if($y>=0) {

+			$this->y=$y;

+	} else {

+			$this->y=$this->h+$y;

+	}

+	}

 

 function SetXY($x, $y)

 {

@@ -992,8 +1067,9 @@ 
 function Output($name='', $dest='')

 {

 	//Output PDF to some destination

-	if($this->state<3)

-		$this->Close();

+	if($this->state<3) {

+			$this->Close();

+	}

 	$dest=strtoupper($dest);

 	if($dest=='')

 	{

@@ -1001,22 +1077,24 @@ 
 		{

 			$name='doc.pdf';

 			$dest='I';

+		} else {

+					$dest='F';

 		}

-		else

-			$dest='F';

 	}

 	switch($dest)

 	{

 		case 'I':

 			//Send to standard output

-			if(ob_get_length())

-				$this->Error('Some data has already been output, can\'t send PDF file');

+			if(ob_get_length()) {

+							$this->Error('Some data has already been output, can\'t send PDF file');

+			}

 			if(php_sapi_name()!='cli')

 			{

 				//We send to a browser

 				header('Content-Type: application/pdf');

-				if(headers_sent())

-					$this->Error('Some data has already been output, can\'t send PDF file');

+				if(headers_sent()) {

+									$this->Error('Some data has already been output, can\'t send PDF file');

+				}

 				header('Content-Length: '.strlen($this->buffer));

 				header('Content-Disposition: inline; filename="'.$name.'"');

 				header('Cache-Control: private, max-age=0, must-revalidate');

@@ -1027,11 +1105,13 @@ 
 			break;

 		case 'D':

 			//Download file

-			if(ob_get_length())

-				$this->Error('Some data has already been output, can\'t send PDF file');

+			if(ob_get_length()) {

+							$this->Error('Some data has already been output, can\'t send PDF file');

+			}

 			header('Content-Type: application/x-download');

-			if(headers_sent())

-				$this->Error('Some data has already been output, can\'t send PDF file');

+			if(headers_sent()) {

+							$this->Error('Some data has already been output, can\'t send PDF file');

+			}

 			header('Content-Length: '.strlen($this->buffer));

 			header('Content-Disposition: attachment; filename="'.$name.'"');

 			header('Cache-Control: private, max-age=0, must-revalidate');

@@ -1042,8 +1122,9 @@ 
 		case 'F':

 			//Save to local file

 			$f=fopen($name,'wb');

-			if(!$f)

-				$this->Error('Unable to create output file: '.$name);

+			if(!$f) {

+							$this->Error('Unable to create output file: '.$name);

+			}

 			fwrite($f,$this->buffer,strlen($this->buffer));

 			fclose($f);

 			break;

@@ -1064,29 +1145,34 @@ 
 function _dochecks()

 {

 	//Check availability of %F

-	if(sprintf('%.1F',1.0)!='1.0')

-		$this->Error('This version of PHP is not supported');

+	if(sprintf('%.1F',1.0)!='1.0') {

+			$this->Error('This version of PHP is not supported');

+	}

 	//Check mbstring overloading

-	if(ini_get('mbstring.func_overload') & 2)

-		$this->Error('mbstring overloading must be disabled');

+	if(ini_get('mbstring.func_overload') & 2) {

+			$this->Error('mbstring overloading must be disabled');

+	}

 	//Disable runtime magic quotes

-	if(get_magic_quotes_runtime())

-		@set_magic_quotes_runtime(0);

-}

+	if(get_magic_quotes_runtime()) {

+			@set_magic_quotes_runtime(0);

+	}

+	}

 

 function _getpageformat($format)

 {

 	$format=strtolower($format);

-	if(!isset($this->PageFormats[$format]))

-		$this->Error('Unknown page format: '.$format);

+	if(!isset($this->PageFormats[$format])) {

+			$this->Error('Unknown page format: '.$format);

+	}

 	$a=$this->PageFormats[$format];

 	return array($a[0]/$this->k, $a[1]/$this->k);

 }

 

 function _getfontpath()

 {

-	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))

-		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');

+	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font')) {

+			define('FPDF_FONTPATH',dirname(__FILE__).'/font/');

+	}

 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';

 }

 

@@ -1099,16 +1185,18 @@ 
 	$this->y=$this->tMargin;

 	$this->FontFamily='';

 	//Check page size

-	if($orientation=='')

-		$orientation=$this->DefOrientation;

-	else

-		$orientation=strtoupper($orientation[0]);

-	if($format=='')

-		$format=$this->DefPageFormat;

-	else

+	if($orientation=='') {

+			$orientation=$this->DefOrientation;

+	} else {

+			$orientation=strtoupper($orientation[0]);

+	}

+	if($format=='') {

+			$format=$this->DefPageFormat;

+	} else

 	{

-		if(is_string($format))

-			$format=$this->_getpageformat($format);

+		if(is_string($format)) {

+					$format=$this->_getpageformat($format);

+		}

 	}

 	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])

 	{

@@ -1117,8 +1205,7 @@ 
 		{

 			$this->w=$format[0];

 			$this->h=$format[1];

-		}

-		else

+		} else

 		{

 			$this->w=$format[1];

 			$this->h=$format[0];

@@ -1129,9 +1216,10 @@ 
 		$this->CurOrientation=$orientation;

 		$this->CurPageFormat=$format;

 	}

-	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])

-		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);

-}

+	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1]) {

+			$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);

+	}

+	}

 

 function _endpage()

 {

@@ -1170,15 +1258,13 @@ 
 			$c3=ord($s[$i++]);

 			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));

 			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));

-		}

-		elseif($c1>=192)

+		} elseif($c1>=192)

 		{

 			//2-byte character

 			$c2=ord($s[$i++]);

 			$res.=chr(($c1 & 0x1C)>>2);

 			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));

-		}

-		else

+		} else

 		{

 			//Single-byte character

 			$res.="\0".chr($c1);

@@ -1200,22 +1286,26 @@ 
 {

 	//Extract info from a JPEG file

 	$a=GetImageSize($file);

-	if(!$a)

-		$this->Error('Missing or incorrect image file: '.$file);

-	if($a[2]!=2)

-		$this->Error('Not a JPEG file: '.$file);

-	if(!isset($a['channels']) || $a['channels']==3)

-		$colspace='DeviceRGB';

-	elseif($a['channels']==4)

-		$colspace='DeviceCMYK';

-	else

-		$colspace='DeviceGray';

+	if(!$a) {

+			$this->Error('Missing or incorrect image file: '.$file);

+	}

+	if($a[2]!=2) {

+			$this->Error('Not a JPEG file: '.$file);

+	}

+	if(!isset($a['channels']) || $a['channels']==3) {

+			$colspace='DeviceRGB';

+	} elseif($a['channels']==4) {

+			$colspace='DeviceCMYK';

+	} else {

+			$colspace='DeviceGray';

+	}

 	$bpc=isset($a['bits']) ? $a['bits'] : 8;

 	//Read whole file

 	$f=fopen($file,'rb');

 	$data='';

-	while(!feof($f))

-		$data.=fread($f,8192);

+	while(!feof($f)) {

+			$data.=fread($f,8192);

+	}

 	fclose($f);

 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);

 }

@@ -1224,35 +1314,43 @@ 
 {

 	//Extract info from a PNG file

 	$f=fopen($file,'rb');

-	if(!$f)

-		$this->Error('Can\'t open image file: '.$file);

+	if(!$f) {

+			$this->Error('Can\'t open image file: '.$file);

+	}

 	//Check signature

-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

-		$this->Error('Not a PNG file: '.$file);

+	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {

+			$this->Error('Not a PNG file: '.$file);

+	}

 	//Read header chunk

 	$this->_readstream($f,4);

-	if($this->_readstream($f,4)!='IHDR')

-		$this->Error('Incorrect PNG file: '.$file);

+	if($this->_readstream($f,4)!='IHDR') {

+			$this->Error('Incorrect PNG file: '.$file);

+	}

 	$w=$this->_readint($f);

 	$h=$this->_readint($f);

 	$bpc=ord($this->_readstream($f,1));

-	if($bpc>8)

-		$this->Error('16-bit depth not supported: '.$file);

+	if($bpc>8) {

+			$this->Error('16-bit depth not supported: '.$file);

+	}

 	$ct=ord($this->_readstream($f,1));

-	if($ct==0)

-		$colspace='DeviceGray';

-	elseif($ct==2)

-		$colspace='DeviceRGB';

-	elseif($ct==3)

-		$colspace='Indexed';

-	else

-		$this->Error('Alpha channel not supported: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

-		$this->Error('Unknown compression method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

-		$this->Error('Unknown filter method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

-		$this->Error('Interlacing not supported: '.$file);

+	if($ct==0) {

+			$colspace='DeviceGray';

+	} elseif($ct==2) {

+			$colspace='DeviceRGB';

+	} elseif($ct==3) {

+			$colspace='Indexed';

+	} else {

+			$this->Error('Alpha channel not supported: '.$file);

+	}

+	if(ord($this->_readstream($f,1))!=0) {

+			$this->Error('Unknown compression method: '.$file);

+	}

+	if(ord($this->_readstream($f,1))!=0) {

+			$this->Error('Unknown filter method: '.$file);

+	}

+	if(ord($this->_readstream($f,1))!=0) {

+			$this->Error('Interlacing not supported: '.$file);

+	}

 	$this->_readstream($f,4);

 	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';

 	//Scan chunks looking for palette, transparency and image data

@@ -1268,37 +1366,37 @@ 
 			//Read palette

 			$pal=$this->_readstream($f,$n);

 			$this->_readstream($f,4);

-		}

-		elseif($type=='tRNS')

+		} elseif($type=='tRNS')

 		{

 			//Read transparency info

 			$t=$this->_readstream($f,$n);

-			if($ct==0)

-				$trns=array(ord(substr($t,1,1)));

-			elseif($ct==2)

-				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));

-			else

+			if($ct==0) {

+							$trns=array(ord(substr($t,1,1)));

+			} elseif($ct==2) {

+							$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));

+			} else

 			{

 				$pos=strpos($t,chr(0));

-				if($pos!==false)

-					$trns=array($pos);

+				if($pos!==false) {

+									$trns=array($pos);

+				}

 			}

 			$this->_readstream($f,4);

-		}

-		elseif($type=='IDAT')

+		} elseif($type=='IDAT')

 		{

 			//Read image data block

 			$data.=$this->_readstream($f,$n);

 			$this->_readstream($f,4);

+		} elseif($type=='IEND') {

+					break;

+		} else {

+					$this->_readstream($f,$n+4);

 		}

-		elseif($type=='IEND')

-			break;

-		else

-			$this->_readstream($f,$n+4);

 	}

 	while($n);

-	if($colspace=='Indexed' && empty($pal))

-		$this->Error('Missing palette in '.$file);

+	if($colspace=='Indexed' && empty($pal)) {

+			$this->Error('Missing palette in '.$file);

+	}

 	fclose($f);

 	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);

 }

@@ -1310,13 +1408,15 @@ 
 	while($n>0 && !feof($f))

 	{

 		$s=fread($f,$n);

-		if($s===false)

-			$this->Error('Error while reading stream');

+		if($s===false) {

+					$this->Error('Error while reading stream');

+		}

 		$n-=strlen($s);

 		$res.=$s;

 	}

-	if($n>0)

-		$this->Error('Unexpected end of stream');

+	if($n>0) {

+			$this->Error('Unexpected end of stream');

+	}

 	return $res;

 }

 

@@ -1330,19 +1430,24 @@ 
 function _parsegif($file)

 {

 	//Extract info from a GIF file (via PNG conversion)

-	if(!function_exists('imagepng'))

-		$this->Error('GD extension is required for GIF support');

-	if(!function_exists('imagecreatefromgif'))

-		$this->Error('GD has no GIF read support');

+	if(!function_exists('imagepng')) {

+			$this->Error('GD extension is required for GIF support');

+	}

+	if(!function_exists('imagecreatefromgif')) {

+			$this->Error('GD has no GIF read support');

+	}

 	$im=imagecreatefromgif($file);

-	if(!$im)

-		$this->Error('Missing or incorrect image file: '.$file);

+	if(!$im) {

+			$this->Error('Missing or incorrect image file: '.$file);

+	}

 	imageinterlace($im,0);

 	$tmp=tempnam('.','gif');

-	if(!$tmp)

-		$this->Error('Unable to create a temporary file');

-	if(!imagepng($im,$tmp))

-		$this->Error('Error while saving to temporary file');

+	if(!$tmp) {

+			$this->Error('Unable to create a temporary file');

+	}

+	if(!imagepng($im,$tmp)) {

+			$this->Error('Error while saving to temporary file');

+	}

 	imagedestroy($im);

 	$info=$this->_parsepng($tmp);

 	unlink($tmp);

@@ -1367,11 +1472,12 @@ 
 function _out($s)

 {

 	//Add a line to the document

-	if($this->state==2)

-		$this->pages[$this->page].=$s."\n";

-	else

-		$this->buffer.=$s."\n";

-}

+	if($this->state==2) {

+			$this->pages[$this->page].=$s."\n";

+	} else {

+			$this->buffer.=$s."\n";

+	}

+	}

 

 function _putpages()

 {

@@ -1379,15 +1485,15 @@ 
 	if(!empty($this->AliasNbPages))

 	{

 		//Replace number of pages

-		for($n=1;$n<=$nb;$n++)

-			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);

+		for($n=1;$n<=$nb;$n++) {

+					$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);

+		}

 	}

 	if($this->DefOrientation=='P')

 	{

 		$wPt=$this->DefPageFormat[0]*$this->k;

 		$hPt=$this->DefPageFormat[1]*$this->k;

-	}

-	else

+	} else

 	{

 		$wPt=$this->DefPageFormat[1]*$this->k;

 		$hPt=$this->DefPageFormat[0]*$this->k;

@@ -1399,8 +1505,9 @@ 
 		$this->_newobj();

 		$this->_out('<</Type /Page');

 		$this->_out('/Parent 1 0 R');

-		if(isset($this->PageSizes[$n]))

-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));

+		if(isset($this->PageSizes[$n])) {

+					$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));

+		}

 		$this->_out('/Resources 2 0 R');

 		if(isset($this->PageLinks[$n]))

 		{

@@ -1410,9 +1517,9 @@ 
 			{

 				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);

 				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';

-				if(is_string($pl[4]))

-					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

-				else

+				if(is_string($pl[4])) {

+									$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

+				} else

 				{

 					$l=$this->links[$pl[4]];

 					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;

@@ -1435,8 +1542,9 @@ 
 	$this->_out('1 0 obj');

 	$this->_out('<</Type /Pages');

 	$kids='/Kids [';

-	for($i=0;$i<$nb;$i++)

-		$kids.=(3+2*$i).' 0 R ';

+	for($i=0;$i<$nb;$i++) {

+			$kids.=(3+2*$i).' 0 R ';

+	}

 	$this->_out($kids.']');

 	$this->_out('/Count '.$nb);

 	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));

@@ -1461,10 +1569,12 @@ 
 		$this->FontFiles[$file]['n']=$this->n;

 		$font='';

 		$f=fopen($this->_getfontpath().$file,'rb',1);

-		if(!$f)

-			$this->Error('Font file not found');

-		while(!feof($f))

-			$font.=fread($f,8192);

+		if(!$f) {

+					$this->Error('Font file not found');

+		}

+		while(!feof($f)) {

+					$font.=fread($f,8192);

+		}

 		fclose($f);

 		$compressed=(substr($file,-2)=='.z');

 		if(!$compressed && isset($info['length2']))

@@ -1482,11 +1592,13 @@ 
 			}

 		}

 		$this->_out('<</Length '.strlen($font));

-		if($compressed)

-			$this->_out('/Filter /FlateDecode');

+		if($compressed) {

+					$this->_out('/Filter /FlateDecode');

+		}

 		$this->_out('/Length1 '.$info['length1']);

-		if(isset($info['length2']))

-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');

+		if(isset($info['length2'])) {

+					$this->_out('/Length2 '.$info['length2'].' /Length3 0');

+		}

 		$this->_out('>>');

 		$this->_putstream($font);

 		$this->_out('endobj');

@@ -1504,12 +1616,12 @@ 
 			$this->_out('<</Type /Font');

 			$this->_out('/BaseFont /'.$name);

 			$this->_out('/Subtype /Type1');

-			if($name!='Symbol' && $name!='ZapfDingbats')

-				$this->_out('/Encoding /WinAnsiEncoding');

+			if($name!='Symbol' && $name!='ZapfDingbats') {

+							$this->_out('/Encoding /WinAnsiEncoding');

+			}

 			$this->_out('>>');

 			$this->_out('endobj');

-		}

-		elseif($type=='Type1' || $type=='TrueType')

+		} elseif($type=='Type1' || $type=='TrueType')

 		{

 			//Additional Type1 or TrueType font

 			$this->_newobj();

@@ -1521,10 +1633,11 @@ 
 			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');

 			if($font['enc'])

 			{

-				if(isset($font['diff']))

-					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');

-				else

-					$this->_out('/Encoding /WinAnsiEncoding');

+				if(isset($font['diff'])) {

+									$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');

+				} else {

+									$this->_out('/Encoding /WinAnsiEncoding');

+				}

 			}

 			$this->_out('>>');

 			$this->_out('endobj');

@@ -1532,27 +1645,30 @@ 
 			$this->_newobj();

 			$cw=&$font['cw'];

 			$s='[';

-			for($i=32;$i<=255;$i++)

-				$s.=$cw[chr($i)].' ';

+			for($i=32;$i<=255;$i++) {

+							$s.=$cw[chr($i)].' ';

+			}

 			$this->_out($s.']');

 			$this->_out('endobj');

 			//Descriptor

 			$this->_newobj();

 			$s='<</Type /FontDescriptor /FontName /'.$name;

-			foreach($font['desc'] as $k=>$v)

-				$s.=' /'.$k.' '.$v;

+			foreach($font['desc'] as $k=>$v) {

+							$s.=' /'.$k.' '.$v;

+			}

 			$file=$font['file'];

-			if($file)

-				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';

+			if($file) {

+							$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';

+			}

 			$this->_out($s.'>>');

 			$this->_out('endobj');

-		}

-		else

+		} else

 		{

 			//Allow for additional types

 			$mtd='_put'.strtolower($type);

-			if(!method_exists($this,$mtd))

-				$this->Error('Unsupported font type: '.$type);

+			if(!method_exists($this,$mtd)) {

+							$this->Error('Unsupported font type: '.$type);

+			}

 			$this->$mtd($font);

 		}

 	}

@@ -1570,24 +1686,28 @@ 
 		$this->_out('/Subtype /Image');

 		$this->_out('/Width '.$info['w']);

 		$this->_out('/Height '.$info['h']);

-		if($info['cs']=='Indexed')

-			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');

-		else

+		if($info['cs']=='Indexed') {

+					$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');

+		} else

 		{

 			$this->_out('/ColorSpace /'.$info['cs']);

-			if($info['cs']=='DeviceCMYK')

-				$this->_out('/Decode [1 0 1 0 1 0 1 0]');

+			if($info['cs']=='DeviceCMYK') {

+							$this->_out('/Decode [1 0 1 0 1 0 1 0]');

+			}

 		}

 		$this->_out('/BitsPerComponent '.$info['bpc']);

-		if(isset($info['f']))

-			$this->_out('/Filter /'.$info['f']);

-		if(isset($info['parms']))

-			$this->_out($info['parms']);

+		if(isset($info['f'])) {

+					$this->_out('/Filter /'.$info['f']);

+		}

+		if(isset($info['parms'])) {

+					$this->_out($info['parms']);

+		}

 		if(isset($info['trns']) && is_array($info['trns']))

 		{

 			$trns='';

-			for($i=0;$i<count($info['trns']);$i++)

-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';

+			for($i=0;$i<count($info['trns']);$i++) {

+							$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';

+			}

 			$this->_out('/Mask ['.$trns.']');

 		}

 		$this->_out('/Length '.strlen($info['data']).'>>');

@@ -1608,16 +1728,18 @@ 
 

 function _putxobjectdict()

 {

-	foreach($this->images as $image)

-		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');

-}

+	foreach($this->images as $image) {

+			$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');

+	}

+	}

 

 function _putresourcedict()

 {

 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');

 	$this->_out('/Font <<');

-	foreach($this->fonts as $font)

-		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');

+	foreach($this->fonts as $font) {

+			$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');

+	}

 	$this->_out('>>');

 	$this->_out('/XObject <<');

 	$this->_putxobjectdict();

@@ -1640,16 +1762,21 @@ 
 function _putinfo()

 {

 	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));

-	if(!empty($this->title))

-		$this->_out('/Title '.$this->_textstring($this->title));

-	if(!empty($this->subject))

-		$this->_out('/Subject '.$this->_textstring($this->subject));

-	if(!empty($this->author))

-		$this->_out('/Author '.$this->_textstring($this->author));

-	if(!empty($this->keywords))

-		$this->_out('/Keywords '.$this->_textstring($this->keywords));

-	if(!empty($this->creator))

-		$this->_out('/Creator '.$this->_textstring($this->creator));

+	if(!empty($this->title)) {

+			$this->_out('/Title '.$this->_textstring($this->title));

+	}

+	if(!empty($this->subject)) {

+			$this->_out('/Subject '.$this->_textstring($this->subject));

+	}

+	if(!empty($this->author)) {

+			$this->_out('/Author '.$this->_textstring($this->author));

+	}

+	if(!empty($this->keywords)) {

+			$this->_out('/Keywords '.$this->_textstring($this->keywords));

+	}

+	if(!empty($this->creator)) {

+			$this->_out('/Creator '.$this->_textstring($this->creator));

+	}

 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

 

@@ -1657,21 +1784,23 @@ 
 {

 	$this->_out('/Type /Catalog');

 	$this->_out('/Pages 1 0 R');

-	if($this->ZoomMode=='fullpage')

-		$this->_out('/OpenAction [3 0 R /Fit]');

-	elseif($this->ZoomMode=='fullwidth')

-		$this->_out('/OpenAction [3 0 R /FitH null]');

-	elseif($this->ZoomMode=='real')

-		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');

-	elseif(!is_string($this->ZoomMode))

-		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');

-	if($this->LayoutMode=='single')

-		$this->_out('/PageLayout /SinglePage');

-	elseif($this->LayoutMode=='continuous')

-		$this->_out('/PageLayout /OneColumn');

-	elseif($this->LayoutMode=='two')

-		$this->_out('/PageLayout /TwoColumnLeft');

-}

+	if($this->ZoomMode=='fullpage') {

+			$this->_out('/OpenAction [3 0 R /Fit]');

+	} elseif($this->ZoomMode=='fullwidth') {

+			$this->_out('/OpenAction [3 0 R /FitH null]');

+	} elseif($this->ZoomMode=='real') {

+			$this->_out('/OpenAction [3 0 R /XYZ null null 1]');

+	} elseif(!is_string($this->ZoomMode)) {

+			$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');

+	}

+	if($this->LayoutMode=='single') {

+			$this->_out('/PageLayout /SinglePage');

+	} elseif($this->LayoutMode=='continuous') {

+			$this->_out('/PageLayout /OneColumn');

+	} elseif($this->LayoutMode=='two') {

+			$this->_out('/PageLayout /TwoColumnLeft');

+	}

+	}

 

 function _putheader()

 {

@@ -1707,8 +1836,9 @@ 
 	$this->_out('xref');

 	$this->_out('0 '.($this->n+1));

 	$this->_out('0000000000 65535 f ');

-	for($i=1;$i<=$this->n;$i++)

-		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));

+	for($i=1;$i<=$this->n;$i++) {

+			$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));

+	}

 	//Trailer

 	$this->_out('trailer');

 	$this->_out('<<');

statistic/chart.php

Spacing +14 added lines, -14 removed lines

@@ -5,7 +5,7 @@ 
 //if($user['level'] != "Manager")

 //{ 	exit("You don't have permission to access this page!"); }

 $ticket_list = $tickets->count_tickets_by_customer();

-$i=0;$color[0]='FF0000';$color[1]='00FF00';$color[2]='FFFF00';$color[3]='0000FF';$color[4]='FF00FF';

+$i = 0; $color[0] = 'FF0000'; $color[1] = '00FF00'; $color[2] = 'FFFF00'; $color[3] = '0000FF'; $color[4] = 'FF00FF';

 foreach ($ticket_list as $ticket) 

 {	$customer  = $customers->customer_data($ticket['idcustomer']);

 	//$datachart .= "<set value='$ticket[total]' name='$customer[namacustomer]' color='$color[$i]' />";

@@ -31,15 +31,15 @@ 
 $arr_value2 = explode("#", $value2);

 $arr_name2 = explode("#", $name2);

 

-$ResolvedBulan=Array(0,0,0,0,0,0,0,0,0,0,0,0,0);

+$ResolvedBulan = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

 $ticket_list3 = $tickets->count_resolved_tickets_by_month();

 foreach ($ticket_list3 as $ticket3) 

-{	@$ResolvedBulan[$ticket3['Bulan']]=$ticket3['Total'];

+{	@$ResolvedBulan[$ticket3['Bulan']] = $ticket3['Total'];

 }

-$InProgressBulan=Array(0,0,0,0,0,0,0,0,0,0,0,0,0);

+$InProgressBulan = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

 $ticket_list4 = $tickets->count_inprogress_tickets_by_month();

 foreach ($ticket_list4 as $ticket4) 

-{	@$InProgressBulan[$ticket4['Bulan']]=$ticket4['Total'];

+{	@$InProgressBulan[$ticket4['Bulan']] = $ticket4['Total'];

 }

 ?>

 <!DOCTYPE html>

@@ -71,11 +71,11 @@ 
 		type: "Pie2D",

 		data:	"<graph caption='Top 5 Ticket Received By Company' subcaption='This Year' decimalPrecision='0'" +

 				"bgColor='b9c9fe' baseFontSize='12' Bold='1' showNames='1' showPercentageInLabel='1'>" +

-				"<set value='<?php echo $arr_value[0];?>' name='<?php echo $arr_name[0];?>' color='FF00FF' />" +

-				"<set value='<?php echo $arr_value[1];?>' name='<?php echo $arr_name[1];?>' color='00FFFF' />" +

-				"<set value='<?php echo $arr_value[2];?>' name='<?php echo $arr_name[2];?>' color='990000' />" +

-				"<set value='<?php echo $arr_value[3];?>' name='<?php echo $arr_name[3];?>' color='660099' />" +

-				"<set value='<?php echo $arr_value[4];?>' name='<?php echo $arr_name[4];?>' color='FF9900' /> </graph>",

+				"<set value='<?php echo $arr_value[0]; ?>' name='<?php echo $arr_name[0]; ?>' color='FF00FF' />" +

+				"<set value='<?php echo $arr_value[1]; ?>' name='<?php echo $arr_name[1]; ?>' color='00FFFF' />" +

+				"<set value='<?php echo $arr_value[2]; ?>' name='<?php echo $arr_name[2]; ?>' color='990000' />" +

+				"<set value='<?php echo $arr_value[3]; ?>' name='<?php echo $arr_name[3]; ?>' color='660099' />" +

+				"<set value='<?php echo $arr_value[4]; ?>' name='<?php echo $arr_name[4]; ?>' color='FF9900' /> </graph>",

 		dataFormat: "XMLData",

 		width: "520",

 		height: "300"

@@ -85,10 +85,10 @@ 
 		type: "Pie2D",

 		data:	"<graph caption='Ticket Received By Status' subcaption='This Year' decimalPrecision='0'" +

 				"bgColor='b9c9fe' baseFontSize='12' Bold='1' showNames='1' showPercentageInLabel='1'>" +

-				"<set value='<?php echo $arr_value2[0];?>' name='<?php echo $arr_name2[0];?>' color='<?php echo $color[0];?>' />" +

-				"<set value='<?php echo $arr_value2[1];?>' name='<?php echo $arr_name2[1];?>' color='<?php echo $color[1];?>' />" +

-				"<set value='<?php echo $arr_value2[2];?>' name='<?php echo $arr_name2[2];?>' color='<?php echo $color[2];?>' />" +

-				"<set value='<?php echo $arr_value2[3];?>' name='<?php echo $arr_name2[3];?>' color='<?php echo $color[3];?>' /> </graph>",

+				"<set value='<?php echo $arr_value2[0]; ?>' name='<?php echo $arr_name2[0]; ?>' color='<?php echo $color[0]; ?>' />" +

+				"<set value='<?php echo $arr_value2[1]; ?>' name='<?php echo $arr_name2[1]; ?>' color='<?php echo $color[1]; ?>' />" +

+				"<set value='<?php echo $arr_value2[2]; ?>' name='<?php echo $arr_name2[2]; ?>' color='<?php echo $color[2]; ?>' />" +

+				"<set value='<?php echo $arr_value2[3]; ?>' name='<?php echo $arr_name2[3]; ?>' color='<?php echo $color[3]; ?>' /> </graph>",

 		dataFormat: "XMLData",

 		width: "520",

 		height: "300"

header.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php 
require 'core/init.php';
$general->logged_out_protect();
$user 		= $users->userdata($_SESSION['loginid']);
$fullname 	= ucwords(strtolower($user['fullname']));
?> 
<!DOCTYPE HTML>
<html>
<head>
	<title>Helpdesk System</title>
	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
	<link rel="stylesheet" type="text/css" href="css/style.css" />
	<script type="text/javascript" src="js/time.js"></script>
</head>
<body bgcolor="#bb2a26" onload="startTime();">	
<table class="header">
<tr>
	<td width="120px"><img src="images/company-logo.png" alt="Company-Logo" width="120px" height="30px" align="middle"></td>
	<td width="200px"><strong>HELPDESK SYSTEM</strong></td>
	<td align="right"><span id="clocktime"></span><span id="welcome"><?php echo " :: Welcome $fullname &nbsp; &nbsp;"; ?> </span></td>
</tr>
<tr><td colspan="3">
<div id='topmenu'>
<ul>
	<li class='active'><a href='home.php' target="_parent"><span>Home</span></a></li>
	<li><a href='ticketnew.php' target="contentFrame"><span>New Ticket</span></a></li>
	<?php
		if ($user['level'] == "Admin")
		{	echo "<li><a href='adminmenu.php' target='leftFrame'><span>Admin</span></a></li>"; 
		}
	?>
	<li><a href='changepwd.php' target="contentFrame"><span>Change Password</span></a></li>
	<li class='last'><a href='logout.php' target="_parent"><span>Logout</span></a></li>
</ul>
</div>
</td></tr>
</table>
<div style="clear:both; margin: 0 0 0px 0;">&nbsp;</div>
</body>
</html>

\ No newline at end of file
+<?php 
require 'core/init.php'; $general->logged_out_protect(); $user = $users->userdata($_SESSION['loginid']); $fullname = ucwords(strtolower($user['fullname'])); ?> 
<!DOCTYPE HTML>
<html>
<head>
	<title>Helpdesk System</title>
	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
	<link rel="stylesheet" type="text/css" href="css/style.css" />
	<script type="text/javascript" src="js/time.js"></script>
</head>
<body bgcolor="#bb2a26" onload="startTime();">	
<table class="header">
<tr>
	<td width="120px"><img src="images/company-logo.png" alt="Company-Logo" width="120px" height="30px" align="middle"></td>
	<td width="200px"><strong>HELPDESK SYSTEM</strong></td>
	<td align="right"><span id="clocktime"></span><span id="welcome"><?php echo " :: Welcome $fullname &nbsp; &nbsp;"; ?> </span></td>
</tr>
<tr><td colspan="3">
<div id='topmenu'>
<ul>
	<li class='active'><a href='home.php' target="_parent"><span>Home</span></a></li>
	<li><a href='ticketnew.php' target="contentFrame"><span>New Ticket</span></a></li>
	<?php
		if ($user['level'] == "Admin") {	echo "<li><a href='adminmenu.php' target='leftFrame'><span>Admin</span></a></li>"; }
	?>
	<li><a href='changepwd.php' target="contentFrame"><span>Change Password</span></a></li>
	<li class='last'><a href='logout.php' target="_parent"><span>Logout</span></a></li>
</ul>
</div>
</td></tr>
</table>
<div style="clear:both; margin: 0 0 0px 0;">&nbsp;</div>
</body>
</html>

\ No newline at end of file

login.php

Spacing +6 added lines, -6 removed lines

@@ -7,18 +7,18 @@ 
 	$password = strip_tags(addslashes(trim($_POST['password']))); 
 	if (empty($username) === true || empty($password) === true) {
 		$errors[] = 'Sorry, but we need your username and password.';
-	} else if ($users->user_exists($username) === false) {
+	}else if ($users->user_exists($username) === false) {
 		$errors[] = 'Sorry, that username doesn\'t exists. Please try again.';
 	} 
 	else
 	{	$login = $users->login($username, $password);
 		if ($login === false) {
 			$errors[] = 'Sorry, that username/password is invalid. Please try again.';
-		}else if (!$users->email_confirmed($username)){
+		}else if (!$users->email_confirmed($username)) {
 			$errors[] = 'Sorry, your account is locked. Please contact Administrator.';
 		}else {
-			$_SESSION['loginid'] =  $login;
-			$users->log_users($login,'Login to Helpdesk System');
+			$_SESSION['loginid'] = $login;
+			$users->log_users($login, 'Login to Helpdesk System');
 			echo $login;
 			header('location: home.php');
 			exit();
@@ -57,8 +57,8 @@ 
 	</table>
 </div>
 <?php 
-	if(empty($errors) === false){
-		echo '<p class="errormsg">' . implode('</p><p class="errormsg">', $errors) . '</p>';	
+	if (empty($errors) === false) {
+		echo '<p class="errormsg">'.implode('</p><p class="errormsg">', $errors).'</p>';	
 	}
 ?>
 <div class="footer">

Braces +3 added lines, -4 removed lines

@@ -9,14 +9,13 @@
 		$errors[] = 'Sorry, but we need your username and password.';
 	} else if ($users->user_exists($username) === false) {
 		$errors[] = 'Sorry, that username doesn\'t exists. Please try again.';
-	} 
-	else
+	} else
 	{	$login = $users->login($username, $password);
 		if ($login === false) {
 			$errors[] = 'Sorry, that username/password is invalid. Please try again.';
-		}else if (!$users->email_confirmed($username)){
+		} else if (!$users->email_confirmed($username)){
 			$errors[] = 'Sorry, your account is locked. Please contact Administrator.';
-		}else {
+		} else {
 			$_SESSION['loginid'] =  $login;
 			$users->log_users($login,'Login to Helpdesk System');
 			echo $login;