Eoxia / wpshop

includes/librairies/pdf/font/helveticab.php

Spacing +14 added lines, -14 removed lines

@@ -1,15 +1,15 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$fpdf_charwidths['helveticaB']=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,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>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,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'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,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,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)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,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)=>280,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)=>611,chr(182)=>556,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)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	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)=>556,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)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+<?php if (!defined('ABSPATH')) exit;
+$fpdf_charwidths['helveticaB'] = 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, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>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, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
+	'B'=>722, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>556, 'K'=>722, 'L'=>611, '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, '['=>333, '\\'=>278, ']'=>333, '^'=>584, '_'=>556, '`'=>333, 'a'=>556, 'b'=>611, 'c'=>556, 'd'=>611, 'e'=>556, 'f'=>333, 'g'=>611, 'h'=>611, 'i'=>278, 'j'=>278, 'k'=>556, 'l'=>278, 'm'=>889,
+	'n'=>611, 'o'=>611, 'p'=>611, 'q'=>611, 'r'=>389, 's'=>556, 't'=>333, 'u'=>611, 'v'=>556, 'w'=>778, 'x'=>556, 'y'=>556, 'z'=>500, '{'=>389, '|'=>280, '}'=>389, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>278, chr(131)=>556,
+	chr(132)=>500, 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)=>278, chr(146)=>278, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+	chr(154)=>556, 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)=>280, 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)=>611, chr(182)=>556, 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)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+	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)=>556, 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)=>611, chr(241)=>611,
+	chr(242)=>611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556);
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $fpdf_charwidths['helveticaB']=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,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,

includes/librairies/pdf/font/zapfdingbats.php

Spacing +14 added lines, -14 removed lines

@@ -1,15 +1,15 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$fpdf_charwidths['zapfdingbats']=array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+<?php if (!defined('ABSPATH')) exit;
+$fpdf_charwidths['zapfdingbats'] = array(
+	chr(0)=>0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
+	chr(22)=>0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
+	','=>549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
+	'B'=>786, 'C'=>788, 'D'=>788, 'E'=>790, 'F'=>793, 'G'=>794, 'H'=>816, 'I'=>823, 'J'=>789, 'K'=>841, 'L'=>823, 'M'=>833, 'N'=>816, 'O'=>831, 'P'=>923, 'Q'=>744, 'R'=>723, 'S'=>749, 'T'=>790, 'U'=>792, 'V'=>695, 'W'=>776,
+	'X'=>768, 'Y'=>792, 'Z'=>759, '['=>707, '\\'=>708, ']'=>682, '^'=>701, '_'=>826, '`'=>815, 'a'=>789, 'b'=>789, 'c'=>707, 'd'=>687, 'e'=>696, 'f'=>689, 'g'=>786, 'h'=>787, 'i'=>713, 'j'=>791, 'k'=>785, 'l'=>791, 'm'=>873,
+	'n'=>761, 'o'=>762, 'p'=>762, 'q'=>759, 'r'=>759, 's'=>892, 't'=>892, 'u'=>788, 'v'=>784, 'w'=>438, 'x'=>138, 'y'=>277, 'z'=>415, '{'=>392, '|'=>392, '}'=>668, '~'=>668, chr(127)=>0, chr(128)=>390, chr(129)=>390, chr(130)=>317, chr(131)=>317,
+	chr(132)=>276, chr(133)=>276, chr(134)=>509, chr(135)=>509, chr(136)=>410, chr(137)=>410, chr(138)=>234, chr(139)=>234, chr(140)=>334, chr(141)=>334, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+	chr(154)=>0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>0, chr(161)=>732, chr(162)=>544, chr(163)=>544, chr(164)=>910, chr(165)=>667, chr(166)=>760, chr(167)=>760, chr(168)=>776, chr(169)=>595, chr(170)=>694, chr(171)=>626, chr(172)=>788, chr(173)=>788, chr(174)=>788, chr(175)=>788,
+	chr(176)=>788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
+	chr(198)=>788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
+	chr(220)=>927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
+	chr(242)=>760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0);
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $fpdf_charwidths['zapfdingbats']=array(
 	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
 	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,

includes/librairies/pdf/fpdf.php

Spacing +861 added lines, -861 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /*******************************************************************************
@@ -13,360 +13,360 @@ 
 * Auteur :  Olivier PLATHEY                                                    *
 *******************************************************************************/
 
-define('FPDF_VERSION','1.6');
+define('FPDF_VERSION', '1.6');
 
 class wpshop_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 wpshop_FPDF($orientation='P', $unit='mm', $format='A4')
+function wpshop_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);
+		$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->Error('Incorrect orientation: ' . $orientation);
+	$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;
+		$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);
+		$this->Error('Incorrect layout display mode: ' . $layout);
 }
 
 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)
 {
 	//Fatal error
-	die('<b>FPDF error:</b> '.$msg);
+	die('<b>FPDF error:</b> ' . $msg);
 }
 
 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()
@@ -385,230 +385,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))
+	include($this->_getfontpath() . $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)
+	$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);
-				include($this->_getfontpath().$file.'.php');
-				if(!isset($fpdf_charwidths[$fontkey]))
+				$file = $family;
+				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');
 			}
-			$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);
+			$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);
 }
 
@@ -618,268 +618,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++;
 		}
@@ -887,74 +887,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)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type=substr($file,$pos+1);
+			$pos = strrpos($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';
-		$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;
+		$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;
 	}
 	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()
@@ -966,10 +966,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()
@@ -981,11 +981,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)
@@ -995,69 +995,69 @@ 
 	$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('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('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)
-				$this->Error('Unable to create output file: '.$name);
-			fwrite($f,$this->buffer,strlen($this->buffer));
+			$f = fopen($name, 'wb');
+			if (!$f)
+				$this->Error('Unable to create output file: ' . $name);
+			fwrite($f, $this->buffer, strlen($this->buffer));
 			fclose($f);
 			break;
 		case 'S':
 			//Return as a string
 			return $this->buffer;
 		default:
-			$this->Error('Incorrect output destination: '.$dest);
+			$this->Error('Incorrect output destination: ' . $dest);
 	}
 	return '';
 }
@@ -1070,124 +1070,124 @@ 
 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]))
-		$this->Error('Unknown page format: '.$format);
-	$a=$this->PageFormats[$format];
-	return array($a[0]/$this->k, $a[1]/$this->k);
+	$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);
 }
 
 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;
 }
 
 function _textstring($s)
 {
 	//Format a text string
-	return '('.$this->_escape($s).')';
+	return '(' . $this->_escape($s) . ')';
 }
 
 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;
@@ -1196,32 +1196,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)
-		$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';
+	$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';
-	$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);
 }
@@ -1229,82 +1229,82 @@ 
 function _parsepng($file)
 {
 	//Extract info from a PNG file
-	$f=fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
+	$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))
-		$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);
-	$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';
+	$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)
+		$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);
-	$this->_readstream($f,4);
-	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+		$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
-	$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))
-		$this->Error('Missing palette in '.$file);
+	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);
 }
@@ -1312,16 +1312,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;
 }
@@ -1329,28 +1329,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)
-		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
-	$tmp=tempnam('.','gif');
-	if(!$tmp)
+	$im = imagecreatefromgif($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))
+	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;
 }
@@ -1359,8 +1359,8 @@ 
 {
 	//Begin a new object
 	$this->n++;
-	$this->offsets[$this->n]=strlen($this->buffer);
-	$this->_out($this->n.' 0 obj');
+	$this->offsets[$this->n] = strlen($this->buffer);
+	$this->_out($this->n . ' 0 obj');
 }
 
 function _putstream($s)
@@ -1373,162 +1373,162 @@ 
 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($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->_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 ';
-	$this->_out($kids.']');
-	$this->_out('/Count '.$nb);
-	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
+	$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('>>');
 	$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('<</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)
+		$this->_out('<</Length ' . strlen($font));
+		if ($compressed)
 			$this->_out('/Filter /FlateDecode');
-		$this->_out('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		$this->_out('/Length1 ' . $info['length1']);
+		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('/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();
 			$this->_out('<</Type /Font');
-			$this->_out('/BaseFont /'.$name);
-			$this->_out('/Subtype /'.$type);
+			$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');
 			}
@@ -1536,29 +1536,29 @@ 
 			$this->_out('endobj');
 			//Widths
 			$this->_newobj();
-			$cw=&$font['cw'];
-			$s='[';
-			for($i=32;$i<=255;$i++)
-				$s.=$cw[chr($i)].' ';
-			$this->_out($s.']');
+			$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';
-			$this->_out($s.'>>');
+			$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))
-				$this->Error('Unsupported font type: '.$type);
+			$mtd = '_put' . strtolower($type);
+			if (!method_exists($this, $mtd))
+				$this->Error('Unsupported font type: ' . $type);
 			$this->$mtd($font);
 		}
 	}
@@ -1566,46 +1566,46 @@ 
 
 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]');
+		$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
 		{
-			$this->_out('/ColorSpace /'.$info['cs']);
-			if($info['cs']=='DeviceCMYK')
+			$this->_out('/ColorSpace /' . $info['cs']);
+			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('/BitsPerComponent ' . $info['bpc']);
+		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']))
+		if (isset($info['trns']) && is_array($info['trns']))
 		{
-			$trns='';
-			for($i=0;$i<count($info['trns']);$i++)
-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
-			$this->_out('/Mask ['.$trns.']');
+			$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']).'>>');
+		$this->_out('/Length ' . strlen($info['data']) . '>>');
 		$this->_putstream($info['data']);
 		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'];
-			$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
+			$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
+			$this->_out('<<' . $filter . '/Length ' . strlen($pal) . '>>');
 			$this->_putstream($pal);
 			$this->_out('endobj');
 		}
@@ -1614,16 +1614,16 @@ 
 
 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();
@@ -1635,7 +1635,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();
@@ -1645,50 +1645,50 @@ 
 
 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));
-	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
+	$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));
+	$this->_out('/CreationDate ' . $this->_textstring('D:' . @date('YmdHis')));
 }
 
 function _putcatalog()
 {
 	$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');
 }
 
 function _putheader()
 {
-	$this->_out('%PDF-'.$this->PDFVersion);
+	$this->_out('%PDF-' . $this->PDFVersion);
 }
 
 function _puttrailer()
 {
-	$this->_out('/Size '.($this->n+1));
-	$this->_out('/Root '.$this->n.' 0 R');
-	$this->_out('/Info '.($this->n-1).' 0 R');
+	$this->_out('/Size ' . ($this->n + 1));
+	$this->_out('/Root ' . $this->n . ' 0 R');
+	$this->_out('/Info ' . ($this->n - 1) . ' 0 R');
 }
 
 function _enddoc()
@@ -1709,12 +1709,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('<<');
@@ -1723,13 +1723,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

@@ -112,21 +112,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
@@ -136,15 +138,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;
@@ -170,8 +171,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;
 }
 
@@ -179,9 +181,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)
 {
@@ -206,62 +209,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;
 }
 
@@ -286,10 +297,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();
@@ -303,8 +316,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;
@@ -330,15 +344,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
@@ -352,8 +369,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)
 	{
@@ -388,33 +406,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);
 }
 
@@ -425,8 +448,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;
 }
 
@@ -434,9 +458,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)
 {
@@ -447,12 +472,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));
 }
 
@@ -460,19 +486,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)
@@ -497,10 +528,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);
+		}
 	}
 }
 
@@ -510,27 +542,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]))
@@ -542,19 +579,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;
@@ -562,20 +601,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()
 {
@@ -588,10 +630,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);
 }
 
@@ -605,10 +649,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);
 }
 
@@ -640,74 +686,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)
 	{
@@ -716,14 +777,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;
 		}
 	}
@@ -752,8 +814,9 @@ 
 			$l=0;
 			$ns=0;
 			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
+			if($border && $nl==2) {
+							$b=$b2;
+			}
 			continue;
 		}
 		if($c==' ')
@@ -768,16 +831,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')
 				{
@@ -792,11 +855,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)
@@ -804,8 +868,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;
 }
@@ -844,8 +909,9 @@ 
 			$nl++;
 			continue;
 		}
-		if($c==' ')
-			$sep=$i;
+		if($c==' ') {
+					$sep=$i;
+		}
 		$l+=$cw[$c];
 		if($l>$wmax)
 		{
@@ -863,11 +929,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;
@@ -882,24 +948,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='')
 {
@@ -910,33 +978,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)
 	{
@@ -950,12 +1021,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()
 {
@@ -966,11 +1039,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()
 {
@@ -982,11 +1056,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)
 {
@@ -998,8 +1073,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=='')
 	{
@@ -1007,22 +1083,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');
@@ -1033,11 +1111,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');
@@ -1048,8 +1128,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;
@@ -1070,29 +1151,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 : '';
 }
 
@@ -1105,16 +1191,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])
 	{
@@ -1123,8 +1211,7 @@ 
 		{
 			$this->w=$format[0];
 			$this->h=$format[1];
-		}
-		else
+		} else
 		{
 			$this->w=$format[1];
 			$this->h=$format[0];
@@ -1135,9 +1222,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()
 {
@@ -1176,15 +1264,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);
@@ -1206,22 +1292,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);
 }
@@ -1230,35 +1320,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
@@ -1274,37 +1372,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);
 }
@@ -1316,13 +1414,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;
 }
 
@@ -1336,19 +1436,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);
@@ -1373,11 +1478,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()
 {
@@ -1385,15 +1491,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;
@@ -1405,8 +1511,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]))
 		{
@@ -1416,9 +1523,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;
@@ -1441,8 +1548,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));
@@ -1467,10 +1575,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']))
@@ -1488,11 +1598,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');
@@ -1510,12 +1622,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();
@@ -1527,10 +1639,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');
@@ -1538,27 +1651,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);
 		}
 	}
@@ -1576,24 +1692,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']).'>>');
@@ -1614,16 +1734,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();
@@ -1646,16 +1768,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')));
 }
 
@@ -1663,21 +1790,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()
 {
@@ -1713,8 +1842,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('<<');

includes/librairies/pdf/fpdf_extends.class.php

Spacing +108 added lines, -108 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 DEFINE('EUR', chr(128)); // Sigle �
@@ -21,7 +21,7 @@ 
 
 	function WordWrap(&$text, $maxwidth) {
 		$text = trim($text);
-		if ($text==='')
+		if ($text === '')
 			return 0;
 		$space = $this->GetStringWidth(' ');
 		$lines = explode("\n", $text);
@@ -39,16 +39,16 @@ 
 				if ($width + $wordwidth <= $maxwidth)
 				{
 					$width += $wordwidth + $space;
-					$text .= $word.' ';
+					$text .= $word . ' ';
 				}
 				else
 				{
 					$width = $wordwidth + $space;
-					$text = rtrim($text)."\n".$word.' ';
+					$text = rtrim($text) . "\n" . $word . ' ';
 					$count++;
 				}
 			}
-			$text = rtrim($text)."\n";
+			$text = rtrim($text) . "\n";
 			$count++;
 		}
 		$text = rtrim($text);
@@ -65,28 +65,28 @@ 
 			return;
 		}
 
-		while(!@is_dir(dirname(end($folder_path))) && dirname(end($folder_path)) != '/' && dirname(end($folder_path)) != '.' && dirname(end($folder_path)) != '') {
+		while (!@is_dir(dirname(end($folder_path))) && dirname(end($folder_path)) != '/' && dirname(end($folder_path)) != '.' && dirname(end($folder_path)) != '') {
 			array_push($folder_path, dirname(end($folder_path)));
 		}
 
-		while($parent_folder_path = array_pop($folder_path)) {
-			if(!@mkdir($parent_folder_path, $rights)) {
+		while ($parent_folder_path = array_pop($folder_path)) {
+			if (!@mkdir($parent_folder_path, $rights)) {
 				user_error("Can't create folder \"$parent_folder_path\".\n");
 			}
 		}
 	}
 
-	function invoice_export( $order_id, $invoice_id = null ) {
+	function invoice_export($order_id, $invoice_id = null) {
 
 		$current_user_id = get_current_user_id();
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
-		if($order['customer_id']==$current_user_id OR is_admin()) {
+		if ($order['customer_id'] == $current_user_id OR is_admin()) {
 
 			if (in_array($order['order_status'], array('completed', 'shipped', 'partially_paid'))) {
 				$invoice_dir = WP_CONTENT_DIR . "/uploads/wpshop_invoices/";
 				$filename = $this->get_invoice_filename($order_id);
-				$invoice_url = $invoice_dir.$filename;
+				$invoice_url = $invoice_dir . $filename;
 
 				// If the invoice has not been already generated
 // 				if ( !file_exists($invoice_url) ) {
@@ -94,15 +94,15 @@ 
 
 					// Currency management
 					$currency = $order['order_currency'];
-					if($currency == 'EUR')$currency = EUR;
-					else $currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					if ($currency == 'EUR')$currency = EUR;
+					else $currency = html_entity_decode(wpshop_tools::wpshop_get_sigle($currency));
 
 					// On d�finit un alias pour le nombre de pages total
 					$this->AliasNbPages();
 					// On ajoute une page au document
 					$this->AddPage();
 					// On lui applique une police
-					$this->SetFont('Arial','',10);
+					$this->SetFont('Arial', '', 10);
 					// Coordonn�es magasin
 					$this->store_head($order_id);
 					// Coordonn�es client
@@ -125,14 +125,14 @@ 
 					$path = $invoice_url;
 					$this->Output($path, "F");
 					// On force le t�l�chargement de la facture
-					$Fichier_a_telecharger = $refdate.".pdf";
+					$Fichier_a_telecharger = $refdate . ".pdf";
 					$this->forceDownload($Fichier_a_telecharger, $path, filesize($path));
 // 				}
 // 				else $this->forceDownload($filename, $invoice_url, filesize($invoice_url));
 			}
-			else echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
+			else echo __('The payment regarding the invoice you requested isn\'t completed', 'wpshop');
 		}
-		else echo __('You don\'t have the rights to access this invoice.','wpshop');
+		else echo __('You don\'t have the rights to access this invoice.', 'wpshop');
 	}
 
 	/** Force le t�l�chargement d'un fichier */
@@ -157,13 +157,13 @@ 
 		$emails = get_option('wpshop_emails', array());
 
 		//Positionnement
-		$this->SetY(55);$this->SetX(12);
+		$this->SetY(55); $this->SetX(12);
 		// Cadre client destinataire
 		$this->rect(10, 52, 80, 40);
 
 		$xsize = 80;
 
-		if(!empty($company) && !empty($emails)) {
+		if (!empty($company) && !empty($emails)) {
 			// Infos
 			$store_name = utf8_decode(utf8_encode($company['company_name']));
 			$store_email = !empty($emails['contact_email']) ? $emails['contact_email'] : null;
@@ -176,19 +176,19 @@ 
 			$store_country = utf8_decode(utf8_encode($company['company_country']));
 
 			// Gras pour le titre
-			$this->SetFont('','B',10);
-			$this->Cell($xsize,5,$store_name,0,1,'L'); $this->SetX(12);
+			$this->SetFont('', 'B', 10);
+			$this->Cell($xsize, 5, $store_name, 0, 1, 'L'); $this->SetX(12);
 			// Police normale pour le reste
-			$this->SetFont('','',9);
-			$this->Cell($xsize,4,$store_street_adress,0,1,'L'); $this->SetX(12);
-			if (!empty($store_suburb)){$this->Cell(80,4,$store_suburb,0,1,'L');} $this->SetX(12);
-			$this->Cell($xsize,4,$store_postcode . ' ' . $store_city,0,1,'L'); $this->SetX(12);
+			$this->SetFont('', '', 9);
+			$this->Cell($xsize, 4, $store_street_adress, 0, 1, 'L'); $this->SetX(12);
+			if (!empty($store_suburb)) {$this->Cell(80, 4, $store_suburb, 0, 1, 'L'); } $this->SetX(12);
+			$this->Cell($xsize, 4, $store_postcode . ' ' . $store_city, 0, 1, 'L'); $this->SetX(12);
 			//if ($store_state != ''){$this->Cell(80,4,$store_state,0,1,'L');} $this->SetX(12);
-			$this->Cell($xsize,4,$store_country,0,1,'L'); $this->SetX(12);
-			$this->Cell($xsize,4,$store_email,0,1,'L'); $this->SetX(12);
+			$this->Cell($xsize, 4, $store_country, 0, 1, 'L'); $this->SetX(12);
+			$this->Cell($xsize, 4, $store_email, 0, 1, 'L'); $this->SetX(12);
 		}
 		else {
-			$this->Cell($xsize,5,_('Nc','wpshop'),0,1,'L');
+			$this->Cell($xsize, 5, _('Nc', 'wpshop'), 0, 1, 'L');
 		}
 	}
 
@@ -198,16 +198,16 @@ 
 		$customer_data = $customer_data['billing']['address'];
 
 		// FPDF ne d�codant pas l'UTF-8, on le fait via PHP
-		$customer_firstname = ( !empty($customer_data['address_first_name']) ) ? utf8_decode(utf8_encode($customer_data['address_first_name'])) : null;
-		$customer_lastname = ( !empty($customer_data['address_last_name']) ) ? utf8_decode(utf8_encode($customer_data['address_last_name'])) : null;
-		$customer_company = ( !empty($customer_data['company']) ) ? utf8_decode(utf8_encode($customer_data['company'])) : null;
-		$customer_street_adress = ( !empty($customer_data['address']) ) ? utf8_decode(utf8_encode($customer_data['address'])) : null;
-		$customer_city = ( !empty($customer_data['city']) ) ? utf8_decode(utf8_encode($customer_data['city'])) : null;
-		$customer_postcode = ( !empty($customer_data['postcode']) ) ? utf8_decode(utf8_encode($customer_data['postcode'])) : null;
-		$customer_state = ( !empty($customer_data['state']) ) ? utf8_decode(utf8_encode($customer_data['state'])) : null;
-		$customer_country = ( !empty($customer_data['country']) ) ? utf8_decode(utf8_encode($customer_data['country'])) : null;
+		$customer_firstname = (!empty($customer_data['address_first_name'])) ? utf8_decode(utf8_encode($customer_data['address_first_name'])) : null;
+		$customer_lastname = (!empty($customer_data['address_last_name'])) ? utf8_decode(utf8_encode($customer_data['address_last_name'])) : null;
+		$customer_company = (!empty($customer_data['company'])) ? utf8_decode(utf8_encode($customer_data['company'])) : null;
+		$customer_street_adress = (!empty($customer_data['address'])) ? utf8_decode(utf8_encode($customer_data['address'])) : null;
+		$customer_city = (!empty($customer_data['city'])) ? utf8_decode(utf8_encode($customer_data['city'])) : null;
+		$customer_postcode = (!empty($customer_data['postcode'])) ? utf8_decode(utf8_encode($customer_data['postcode'])) : null;
+		$customer_state = (!empty($customer_data['state'])) ? utf8_decode(utf8_encode($customer_data['state'])) : null;
+		$customer_country = (!empty($customer_data['country'])) ? utf8_decode(utf8_encode($customer_data['country'])) : null;
 
-		$customer_tva_intra = ( !empty($customer_data['company_tva_intra']) ) ? utf8_decode(utf8_encode($customer_data['company_tva_intra'])) : null;
+		$customer_tva_intra = (!empty($customer_data['company_tva_intra'])) ? utf8_decode(utf8_encode($customer_data['company_tva_intra'])) : null;
 
 		$xsize = 80;
 
@@ -219,16 +219,16 @@ 
 		// Et on �cris
 		// On r�gle la police d'�criture
 		// gras pour le titre
-		$this->SetFont('','B',10);
-		$this->Cell($xsize,5,$customer_lastname.' '.$customer_firstname.(!empty($customer_company)?', '.$customer_company:null),0,1,'L'); $this->SetX(102);
+		$this->SetFont('', 'B', 10);
+		$this->Cell($xsize, 5, $customer_lastname . ' ' . $customer_firstname . (!empty($customer_company) ? ', ' . $customer_company : null), 0, 1, 'L'); $this->SetX(102);
 		// Police normale pour le reste
-		$this->SetFont('','',9);
-		$this->Cell($xsize,4,$customer_street_adress,0,1,'L'); $this->SetX(102);
-		if (!empty($customer_suburb)){$this->Cell($xsize,4,$customer_suburb,0,1,'L');} $this->SetX(102);
-		$this->Cell($xsize,4,$customer_postcode . ' ' . $customer_city,0,1,'L'); $this->SetX(102);
-		if ($customer_state != ''){$this->Cell($xsize,4,$customer_state,0,1,'L');} $this->SetX(102);
-		$this->Cell($xsize,4,$customer_country . ' ',0,1,'L'); $this->SetX(102);
-		if ($customer_tva_intra != ''){$this->Cell($xsize,4,__('TVA Intracommunautaire','wpshop').' : '.$customer_tva_intra,0,1,'L');}
+		$this->SetFont('', '', 9);
+		$this->Cell($xsize, 4, $customer_street_adress, 0, 1, 'L'); $this->SetX(102);
+		if (!empty($customer_suburb)) {$this->Cell($xsize, 4, $customer_suburb, 0, 1, 'L'); } $this->SetX(102);
+		$this->Cell($xsize, 4, $customer_postcode . ' ' . $customer_city, 0, 1, 'L'); $this->SetX(102);
+		if ($customer_state != '') {$this->Cell($xsize, 4, $customer_state, 0, 1, 'L'); } $this->SetX(102);
+		$this->Cell($xsize, 4, $customer_country . ' ', 0, 1, 'L'); $this->SetX(102);
+		if ($customer_tva_intra != '') {$this->Cell($xsize, 4, __('TVA Intracommunautaire', 'wpshop') . ' : ' . $customer_tva_intra, 0, 1, 'L'); }
 	}
 
 	// R�f�rence et date de facturation
@@ -238,34 +238,34 @@ 
 		// On r�cup�re la r�f�rence
 		//$invoice_ref = 'FA'.date('ym').'-0001';
 		// On r�cup�re la date de facturation
-		$invoice_add_date = substr($order['order_date'],0,10);
+		$invoice_add_date = substr($order['order_date'], 0, 10);
 		// On r�cup�re la date d'�ch�ance
 		//$invoice_max_date = '';
 
 		// Positionnement
-		$this->SetY(25); $this->SetX(135); $this->SetFont('','B',14);
-		$this->Cell(50, 5, utf8_decode(__( 'Ref. : ', 'wpshop' )) . $invoice_ref,0,1,'L');
+		$this->SetY(25); $this->SetX(135); $this->SetFont('', 'B', 14);
+		$this->Cell(50, 5, utf8_decode(__('Ref. : ', 'wpshop')) . $invoice_ref, 0, 1, 'L');
 		// Positionnement
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Billing date : ', 'wpshop' )) . $invoice_add_date,0,1,'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Billing date : ', 'wpshop')) . $invoice_add_date, 0, 1, 'L');
 
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Payment method : ', 'wpshop' )) . utf8_decode(wpshop_payment::get_payment_method($order_id)), 0, 1, 'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Payment method : ', 'wpshop')) . utf8_decode(wpshop_payment::get_payment_method($order_id)), 0, 1, 'L');
 
-		$this->SetX(135); $this->SetFont('','',9);
-		$this->Cell(50, 4, utf8_decode(__( 'Transaction id : ', 'wpshop' )) . wpshop_payment::get_payment_transaction_number($order_id), 0, 1, 'L');
+		$this->SetX(135); $this->SetFont('', '', 9);
+		$this->Cell(50, 4, utf8_decode(__('Transaction id : ', 'wpshop')) . wpshop_payment::get_payment_transaction_number($order_id), 0, 1, 'L');
 
 		//$this->SetX(135);
 		//$this->Cell(50, 4, utf8_decode(__( 'Date d\'�ch�ance : ', 'wpshop' )) . $invoice_max_date,0,1,'L');
 
-		return $invoice_ref.'_'.$invoice_add_date;
+		return $invoice_ref . '_' . $invoice_add_date;
 	}
 
 	function get_invoice_filename($order_id) {
 		$order = get_post_meta($order_id, '_order_postmeta', true);
-		$invoice_add_date = substr($order['order_date'],0,10);
+		$invoice_add_date = substr($order['order_date'], 0, 10);
 		$order_invoice_ref = $order['order_invoice_ref'];
-		return $order_invoice_ref.'_'.$invoice_add_date.'.pdf';
+		return $order_invoice_ref . '_' . $invoice_add_date . '.pdf';
 	}
 
 	/**
@@ -275,13 +275,13 @@ 
 	 * @param integer $invoice_id Optionnal An invoice ID, this parameter could be used to call an invoice for a partial payment
 	 */
 	function rows($order_id, $currency, $invoice_id = null) {
-		$title_ref = utf8_decode(__( 'Reference', 'wpshop' ));
-		$title_name = utf8_decode(__( 'Designation', 'wpshop' ));
-		$title_qty = utf8_decode(__( 'Qty', 'wpshop' ));
-		$title_baseprice = utf8_decode(__( 'PU HT', 'wpshop' ));
-		$title_discount = utf8_decode(__( 'Discount', 'wpshop' ));
-		$title_tax = utf8_decode(__( 'TVA (Tax)', 'wpshop' ));
-		$title_price = utf8_decode(__( 'Total ET', 'wpshop' ));
+		$title_ref = utf8_decode(__('Reference', 'wpshop'));
+		$title_name = utf8_decode(__('Designation', 'wpshop'));
+		$title_qty = utf8_decode(__('Qty', 'wpshop'));
+		$title_baseprice = utf8_decode(__('PU HT', 'wpshop'));
+		$title_discount = utf8_decode(__('Discount', 'wpshop'));
+		$title_tax = utf8_decode(__('TVA (Tax)', 'wpshop'));
+		$title_price = utf8_decode(__('Total ET', 'wpshop'));
 
 		/**	Set title for invoice line table	*/
 		$header = array($title_ref, $title_name, $title_qty, $title_baseprice, $title_discount, $title_tax, $title_price);
@@ -289,23 +289,23 @@ 
 		/**	Set column size	*/
 		$w = array(26, 75, 10, 15, 15, 30, 20);
 
-		$this->setXY(10,100);
-		for($i=0;$i<count($header);$i++) {
-			$this->Cell($w[$i],5,$header[$i],1,0,'C');
+		$this->setXY(10, 100);
+		for ($i = 0; $i < count($header); $i++) {
+			$this->Cell($w[$i], 5, $header[$i], 1, 0, 'C');
 		}
 		$this->Ln();
 
 		/**	Get the order content	*/
 		$order_data = get_post_meta($order_id, '_order_postmeta', true);
-		if ( in_array($order_data['order_status'], array('completed', 'shipped') ) ) {
+		if (in_array($order_data['order_status'], array('completed', 'shipped'))) {
 			/**	Foreach item in order: add a row to invoice	*/
 			foreach ($order_data['order_items'] as $o) {
 				$this->row($o, $w, $currency);
 			}
 		}
-		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
-			foreach ( $order_data['order_payment']['received'] as $payment_info ) {
-				if ( !is_array($payment_info) ) {
+		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received'])) {
+			foreach ($order_data['order_payment']['received'] as $payment_info) {
+				if (!is_array($payment_info)) {
 
 				}
 			}
@@ -326,13 +326,13 @@ 
 		$total_ht = !empty($row['item_total_ht']) ? $row['item_total_ht'] : 'Nc';
 
 		// On affiche les valeurs
-		$this->Cell($dim_array[0],8,$product_reference,'LRB',0,'C');
-		$this->Cell($dim_array[1],8,$product_name,'LRB',0,'L');
-		$this->Cell($dim_array[2],8,$qty_invoiced,'LRB',0,'C');
-		$this->Cell($dim_array[3],8,number_format($item_pu_ht,2,'.',' ').' '.$currency,'LRB',0,'C');
-		$this->Cell($dim_array[4],8,number_format($discount_amount,2,'.',' ').' '.$currency,'LRB',0,'C');
-		$this->Cell($dim_array[5],8,number_format($item_tva_total_amount,2,'.',' ').' '.$currency.' (' . round($tax_rate, 2) . '%)','LRB',0,'C');
-		$this->Cell($dim_array[6],8,number_format($total_ht,2,'.',' ').' '.$currency,'LRB',0,'C');
+		$this->Cell($dim_array[0], 8, $product_reference, 'LRB', 0, 'C');
+		$this->Cell($dim_array[1], 8, $product_name, 'LRB', 0, 'L');
+		$this->Cell($dim_array[2], 8, $qty_invoiced, 'LRB', 0, 'C');
+		$this->Cell($dim_array[3], 8, number_format($item_pu_ht, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
+		$this->Cell($dim_array[4], 8, number_format($discount_amount, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
+		$this->Cell($dim_array[5], 8, number_format($item_tva_total_amount, 2, '.', ' ') . ' ' . $currency . ' (' . round($tax_rate, 2) . '%)', 'LRB', 0, 'C');
+		$this->Cell($dim_array[6], 8, number_format($total_ht, 2, '.', ' ') . ' ' . $currency, 'LRB', 0, 'C');
 		$this->Ln();
 	}
 
@@ -344,30 +344,30 @@ 
 		// D�calage
 		$this->Ln();
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Total ET','wpshop'),1);
-		$this->Cell(35,8,number_format($order['order_total_ht'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Total ET', 'wpshop'), 1);
+		$this->Cell(35, 8, number_format($order['order_total_ht'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-		foreach($order['order_tva'] as $k => $v) {
-			$this->Cell(105,10);
-			$this->Cell(50,8,__('Tax','wpshop').' '.$k.'%',1); $this->Cell(35,8,number_format($v,2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		foreach ($order['order_tva'] as $k => $v) {
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, __('Tax', 'wpshop') . ' ' . $k . '%', 1); $this->Cell(35, 8, number_format($v, 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 		}
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Shipping','wpshop'),1); $this->Cell(35,8,number_format($order['order_shipping_cost'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Shipping', 'wpshop'), 1); $this->Cell(35, 8, number_format($order['order_shipping_cost'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-		if(!empty($order['order_grand_total_before_discount']) && $order['order_grand_total_before_discount'] != $order['order_grand_total']){
-			$this->Cell(105,10);
-			$this->Cell(50,8,utf8_decode(__('Total ATI before discount','wpshop')),1);
-			$this->Cell(35,8,number_format($order['order_grand_total_before_discount'],2).' '.$currency,1,0,'C'); $this->Ln();
+		if (!empty($order['order_grand_total_before_discount']) && $order['order_grand_total_before_discount'] != $order['order_grand_total']) {
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, utf8_decode(__('Total ATI before discount', 'wpshop')), 1);
+			$this->Cell(35, 8, number_format($order['order_grand_total_before_discount'], 2) . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 
-			$this->Cell(105,10);
-			$this->Cell(50,8,__('Discount','wpshop'),1);
-			$this->Cell(35,8,'-'.number_format($order['order_discount_amount_total_cart'],2).' '.$currency,1,0,'C'); $this->Ln();
+			$this->Cell(105, 10);
+			$this->Cell(50, 8, __('Discount', 'wpshop'), 1);
+			$this->Cell(35, 8, '-' . number_format($order['order_discount_amount_total_cart'], 2) . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 		}
 
-		$this->Cell(105,10);
-		$this->Cell(50,8,__('Total ATI','wpshop'),1); $this->SetFont('','B',10); $this->Cell(35,8,number_format($order['order_grand_total'],2,'.',' ') . ' ' . $currency,1,0,'C'); $this->Ln();
+		$this->Cell(105, 10);
+		$this->Cell(50, 8, __('Total ATI', 'wpshop'), 1); $this->SetFont('', 'B', 10); $this->Cell(35, 8, number_format($order['order_grand_total'], 2, '.', ' ') . ' ' . $currency, 1, 0, 'C'); $this->Ln();
 	}
 
 	function rib($store_number)
@@ -414,25 +414,25 @@ 
 		$tva_intra = $store['company_tva_intra'];
 		$currency = wpshop_tools::wpshop_get_currency(true);
 
-		$this->SetFont('','',10);
-		$this->SetXY(10,-50);
+		$this->SetFont('', '', 10);
+		$this->SetXY(10, -50);
 
-		if(isset($store['company_member_of_a_approved_management_center']) && $store['company_member_of_a_approved_management_center']) {
-			$this->MultiCell(190,4,utf8_decode(__('Member of an approved management center, accepting as such payments by check.', 'wpshop')),0,'L',FALSE);
+		if (isset($store['company_member_of_a_approved_management_center']) && $store['company_member_of_a_approved_management_center']) {
+			$this->MultiCell(190, 4, utf8_decode(__('Member of an approved management center, accepting as such payments by check.', 'wpshop')), 0, 'L', FALSE);
 			$this->Ln();
 		}
-		$this->MultiCell(190,4,utf8_decode(__('Law 83-629 of 07.12.83, Art. 8: "The administrative authorization does not confer any official character to the company or persons who benefit. It is in no way the responsibility of government."', 'wpshop')),0,'L',FALSE);
+		$this->MultiCell(190, 4, utf8_decode(__('Law 83-629 of 07.12.83, Art. 8: "The administrative authorization does not confer any official character to the company or persons who benefit. It is in no way the responsibility of government."', 'wpshop')), 0, 'L', FALSE);
 		$this->Ln();
-		$this->MultiCell(190,4,utf8_decode($store_name.', '.$society_type.__(' capital of ', 'wpshop').$society_capital.' '.$currency.'. SIRET : '.$siret.'. TVA Intracommunautaire : '.$tva_intra),0,'L',FALSE);
+		$this->MultiCell(190, 4, utf8_decode($store_name . ', ' . $society_type . __(' capital of ', 'wpshop') . $society_capital . ' ' . $currency . '. SIRET : ' . $siret . '. TVA Intracommunautaire : ' . $tva_intra), 0, 'L', FALSE);
 	}
 
 	//En-t�te
 	function Header( ) {
-		$this->SetFont('Arial','B',15);
+		$this->SetFont('Arial', 'B', 15);
 		//D�calage � droite
 		$this->Cell(70);
 		//Titre
-		$this->Cell(30,10,'FACTURE',0,0,'L');
+		$this->Cell(30, 10, 'FACTURE', 0, 0, 'L');
 	}
 
 	//Pied de page
@@ -440,9 +440,9 @@ 
 		//Positionnement � 1,5 cm du bas
 		$this->SetY(-15);
 		//Police Arial italique 8
-		$this->SetFont('Arial','I',8);
+		$this->SetFont('Arial', 'I', 8);
 		//Num�ro de page
-		$this->Cell(0,10,$this->PageNo() . '/{nb}',0,0,'C');
+		$this->Cell(0, 10, $this->PageNo() . '/{nb}', 0, 0, 'C');
 	}
 }
 

Braces +19 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -21,8 +23,9 @@ 
 
 	function WordWrap(&$text, $maxwidth) {
 		$text = trim($text);
-		if ($text==='')
-			return 0;
+		if ($text==='') {
+					return 0;
+		}
 		$space = $this->GetStringWidth(' ');
 		$lines = explode("\n", $text);
 		$text = '';
@@ -40,8 +43,7 @@ 
 				{
 					$width += $wordwidth + $space;
 					$text .= $word.' ';
-				}
-				else
+				} else
 				{
 					$width = $wordwidth + $space;
 					$text = rtrim($text)."\n".$word.' ';
@@ -60,8 +62,7 @@ 
 	function make_recursiv_dir($path, $rights = 0777) {
 		if (!@is_dir($path)) {
 			$folder_path = array($path);
-		}
-		else {
+		} else {
 			return;
 		}
 
@@ -94,8 +95,11 @@ 
 
 					// Currency management
 					$currency = $order['order_currency'];
-					if($currency == 'EUR')$currency = EUR;
-					else $currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					if($currency == 'EUR') {
+						$currency = EUR;
+					} else {
+						$currency = html_entity_decode( wpshop_tools::wpshop_get_sigle($currency) );
+					}
 
 					// On d�finit un alias pour le nombre de pages total
 					$this->AliasNbPages();
@@ -129,10 +133,12 @@ 
 					$this->forceDownload($Fichier_a_telecharger, $path, filesize($path));
 // 				}
 // 				else $this->forceDownload($filename, $invoice_url, filesize($invoice_url));
+			} else {
+				echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
 			}
-			else echo __('The payment regarding the invoice you requested isn\'t completed','wpshop');
+		} else {
+			echo __('You don\'t have the rights to access this invoice.','wpshop');
 		}
-		else echo __('You don\'t have the rights to access this invoice.','wpshop');
 	}
 
 	/** Force le t�l�chargement d'un fichier */
@@ -186,8 +192,7 @@ 
 			//if ($store_state != ''){$this->Cell(80,4,$store_state,0,1,'L');} $this->SetX(12);
 			$this->Cell($xsize,4,$store_country,0,1,'L'); $this->SetX(12);
 			$this->Cell($xsize,4,$store_email,0,1,'L'); $this->SetX(12);
-		}
-		else {
+		} else {
 			$this->Cell($xsize,5,_('Nc','wpshop'),0,1,'L');
 		}
 	}
@@ -302,8 +307,7 @@ 
 			foreach ($order_data['order_items'] as $o) {
 				$this->row($o, $w, $currency);
 			}
-		}
-		else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
+		} else if (in_array($order_data['order_status'], array('partially_paid')) && !empty($order_data['order_payment']) && !empty($order_data['order_payment']['received']) ) {
 			foreach ( $order_data['order_payment']['received'] as $payment_info ) {
 				if ( !is_array($payment_info) ) {
 

includes/librairies/display/form_management.class.php

Braces +7 added lines, -4 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -63,8 +65,10 @@ 
 			}
 			$message .= '</ul></div>';
 			return $message;
-		else :
+		else {
+			:
 			return null;
+		}
 		endif;
 	}
 
@@ -96,8 +100,7 @@ 
 						$email_exist = email_exists($value);
 						if(!is_email($value)) {
 							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
-						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						} elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;

Indentation +15 added lines, -15 removed lines

@@ -26,43 +26,43 @@ 
 	var $filters = array(); // Stores store filters
 
 	/**
-	* Add an error
-	*/
+	 * Add an error
+	 */
 	function add_error( $error ) {
 		$this->errors[] = $error;
 	}
 
 	/**
-	* Add a message
-	*/
+	 * Add a message
+	 */
 	function add_message( $message ) {
 		$this->messages[] = $message;
 	}
 
 		/**
-		* Add a filter
-		*/
+		 * Add a filter
+		 */
 		function add_filter( $attribute_frontend_verification, $function ) {
 			$this->filters[$attribute_frontend_verification] = $function;
 		}
 
 	/**
-	* Get error count
-	*/
+	 * Get error count
+	 */
 	function error_count() {
 		return sizeof($this->errors);
 	}
 
 	/**
-	* Get message count
-	*/
+	 * Get message count
+	 */
 	function message_count() {
 		return sizeof($this->messages);
 	}
 
 	/**
-	* Output the errors and messages
-	*/
+	 * Output the errors and messages
+	 */
 	function show_messages() {
 		if (!empty($this->errors) && $this->error_count()>0) :
 			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
@@ -77,9 +77,9 @@ 
 	}
 
 	/** Valide les champs d'un formlaire
-	* @param array $array : Champs a lire
-	* @return boolean
-	*/
+	 * @param array $array : Champs a lire
+	 * @return boolean
+	 */
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 
 

Spacing +35 added lines, -35 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -28,21 +28,21 @@ 
 	/**
 	* Add an error
 	*/
-	function add_error( $error ) {
+	function add_error($error) {
 		$this->errors[] = $error;
 	}
 
 	/**
 	* Add a message
 	*/
-	function add_message( $message ) {
+	function add_message($message) {
 		$this->messages[] = $message;
 	}
 
 		/**
 		* Add a filter
 		*/
-		function add_filter( $attribute_frontend_verification, $function ) {
+		function add_filter($attribute_frontend_verification, $function) {
 			$this->filters[$attribute_frontend_verification] = $function;
 		}
 
@@ -64,10 +64,10 @@ 
 	* Output the errors and messages
 	*/
 	function show_messages() {
-		if (!empty($this->errors) && $this->error_count()>0) :
-			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
-			foreach($this->errors as $e) {
-				$message .= '<li>'.$e.'</li>';
+		if (!empty($this->errors) && $this->error_count() > 0) :
+			$message = '<div class="error_bloc">' . __('Errors were detected', 'wpshop') . ' :<ul>';
+			foreach ($this->errors as $e) {
+				$message .= '<li>' . $e . '</li>';
 			}
 			$message .= '</ul></div>';
 			return $message;
@@ -83,42 +83,42 @@ 
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 
 
-		$user_id = empty( $user ) ? get_current_user_id() : $user;
-		foreach($array as $attribute_id => $attribute_definition):
-			$values_array = !empty($values) ? $values : (array) $_POST['attribute'];
-			$value = ( !empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']]) ) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
+		$user_id = empty($user) ? get_current_user_id() : $user;
+		foreach ($array as $attribute_id => $attribute_definition):
+			$values_array = !empty($values) ? $values : (array)$_POST['attribute'];
+			$value = (!empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']])) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
 
 			// Si le champ est obligatoire
-			if ( empty($value) && ($attribute_definition['required'] == 'yes') ) {
-				$this->add_error(sprintf(__('The field "%s" is required','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+			if (empty($value) && ($attribute_definition['required'] == 'yes')) {
+				$this->add_error(sprintf(__('The field "%s" is required', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 			}
-			if( $partial == false && $attribute_definition['_need_verification'] == 'yes'  ) {
-				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'].'2'];
-				if ( $value != $value2) {
-					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect','wpshop'),__($attribute_definition['label'], 'wpshop') ));
+			if ($partial == false && $attribute_definition['_need_verification'] == 'yes') {
+				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'] . '2'];
+				if ($value != $value2) {
+					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 				}
 			}
-			if(!empty($value) && !empty($attribute_definition['type'])) {
-				switch($attribute_definition['frontend_verification']) {
+			if (!empty($value) && !empty($attribute_definition['type'])) {
+				switch ($attribute_definition['frontend_verification']) {
 					case 'email':
 						$email_exist = email_exists($value);
-						if(!is_email($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
+						if (!is_email($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), $attribute_definition['label']));
 						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						elseif (empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0))) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;
 
 					case 'postcode':
-						if(!wpshop_tools::is_postcode($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_postcode($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
 					case 'phone':
-						if(!wpshop_tools::is_phone($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'), __( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_phone($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
@@ -126,22 +126,22 @@ 
 						$username_exists = username_exists($value);
 						// On s'assure que le nom d'utilisateur est libre
 						if (!validate_username($value)) :
-							$this->add_error( __('Invalid email/username.', 'wpshop') );
-						elseif ( ($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0) ) :
-							$this->add_error( __('An account is already registered with that username. Please choose another.', 'wpshop') );
+							$this->add_error(__('Invalid email/username.', 'wpshop'));
+						elseif (($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0)) :
+							$this->add_error(__('An account is already registered with that username. Please choose another.', 'wpshop'));
 						endif;
 					break;
 				}
 				if (array_key_exists($attribute_definition['name'], $this->filters) && is_callable($this->filters[$attribute_definition['name']])) {
 					$validation = call_user_func($this->filters[$attribute_definition['name']], $value);
-					if( !filter_var($validation, FILTER_VALIDATE_BOOLEAN) ) {
-						$this->add_error( $validation );
+					if (!filter_var($validation, FILTER_VALIDATE_BOOLEAN)) {
+						$this->add_error($validation);
 					}
 				}
 			}
 		endforeach;
 
-		return ($this->error_count()==0);
+		return ($this->error_count() == 0);
 	}
 
 }

includes/librairies/notices.class.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
 	die( __('Access is not allowed by this way', 'wpshop') );

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -19,36 +19,36 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_notices{
+class wpshop_notices {
 
 	/** Notice the user to install the plugin */
 	public static function sale_shop_notice() {
-		$plug_version = substr( WPSHOP_VERSION, 0, 5 );
+		$plug_version = substr(WPSHOP_VERSION, 0, 5);
 
 
-		$notice_display_user_option = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
+		$notice_display_user_option = get_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
 
 		$notice = '';
 		$messages_to_hide = '';
 		/* Check that the user has already choose a payment method */
-		$paymentMethod = get_option( 'wps_payment_mode' );
+		$paymentMethod = get_option('wps_payment_mode');
 		$no_payment_mode_configurated = true;
-		if ( !empty($paymentMethod ) && !empty($paymentMethod['mode']) ) {
-			foreach( $paymentMethod['mode'] as $k => $pm ) {
-				if ( !empty($pm['active'] ) ) {
+		if (!empty($paymentMethod) && !empty($paymentMethod['mode'])) {
+			foreach ($paymentMethod['mode'] as $k => $pm) {
+				if (!empty($pm['active'])) {
 					$no_payment_mode_configurated = false;
 				}
 			}
 		}
 
-		if( $no_payment_mode_configurated ) {
-			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
+		if ($no_payment_mode_configurated) {
+			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
 		}
 
 		/* Check that the user has already choose a payment method */
 		$emails = get_option('wpshop_emails', array());
-		if(empty($emails)) {
-			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
+		if (empty($emails)) {
+			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
 		}
 
 
@@ -58,20 +58,20 @@ 
 			$messages_to_hide .= 'SLICKSHOP,';
 		}*/
 
-		$install = !empty( $_GET[ 'install' ] ) ? sanitize_text_field( $_GET[ 'install' ] ) : '';
+		$install = !empty($_GET['install']) ? sanitize_text_field($_GET['install']) : '';
 
-		if(!empty($notice) && ( empty( $install ) ) ) {
-			$notice='<p>'.__('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop').'</p><ul>'.$notice.'</ul>';
-			if ( !empty($messages_to_hide) ) {
-				$notice .= '<button data-nonce="' . wp_create_nonce( 'wps_hide_notice_messages' ) . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' .__('Hide this message', 'wpshop'). '</button>';
-				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' .$messages_to_hide. '"/>';
+		if (!empty($notice) && (empty($install))) {
+			$notice = '<p>' . __('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop') . '</p><ul>' . $notice . '</ul>';
+			if (!empty($messages_to_hide)) {
+				$notice .= '<button data-nonce="' . wp_create_nonce('wps_hide_notice_messages') . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' . __('Hide this message', 'wpshop') . '</button>';
+				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' . $messages_to_hide . '"/>';
 			}
 			self::admin_notice_container($notice, 'wpshop_shop_sale_type_notice');
 		}
 	}
 
 	/**		*/
-	public static function admin_notice_container($message, $container_class = ''){
+	public static function admin_notice_container($message, $container_class = '') {
 		?>
 		<div class="updated wpshop_admin_notice <?php echo $container_class; ?>" id="<?php echo $container_class; ?>" >
 			<h3><?php _e('Configure my shop', 'wpshop') ?></h3>

includes/librairies/payments/payment.class.php

Indentation +6 added lines, -6 removed lines

@@ -218,8 +218,8 @@ 
 
 
 	/**
-	* Reduce the stock regarding the order
-	*/
+	 * Reduce the stock regarding the order
+	 */
 	function the_order_payment_is_completed($order_id, $txn_id = null) {
 		// Donnees commandes
 		$order = get_post_meta($order_id, '_order_postmeta', true);
@@ -293,8 +293,8 @@ 
 	}
 
 	/**
-	* Get payment method
-	*/
+	 * Get payment method
+	 */
 	function get_payment_method($post_id){
 		$pm = __('Nc','wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
@@ -321,8 +321,8 @@ 
 	}
 
 	/**
-	* Set payment transaction number
-	*/
+	 * Set payment transaction number
+	 */
 	function display_payment_receiver_interface($post_id) {
 		$payment_validation = '';
 		$display_button = false;

Spacing +195 added lines, -195 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -20,29 +20,29 @@ 
 
 		$wpshop_paypal = new wpshop_paypal();
 		// If the CIC payment method is active
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if(WPSHOP_PAYMENT_METHOD_CIC && ( !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']) ) ) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if (WPSHOP_PAYMENT_METHOD_CIC && (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']))) {
 			$wpshop_cic = new wpshop_CIC();
 		}
-		wpshop_tools::create_custom_hook ('wpshop_bankserver_reponse');
+		wpshop_tools::create_custom_hook('wpshop_bankserver_reponse');
 
 	}
 
 	public static function get_success_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_page_id')));
 		return self::construct_url_parameters($url, 'paymentResult', 'success');
 	}
 
 	public static function get_cancel_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_nok_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_nok_page_id')));
 		return $url;
 	}
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if ($interoguation_marker_pos === false)
+			return $url . '?' . $param . '=' . $value;
+		else return $url . '&' . $param . '=' . $value;
 	}
 
 	/**
@@ -51,23 +51,23 @@ 
 	public static function wpshop_payment_result() {
 		global $wpdb;
 		$user_ID = get_current_user_id();
-		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
-		$order_post_id = $wpdb->get_var( $query );
-		if ( !empty($order_post_id) ) {
-			$order_postmeta = get_post_meta($order_post_id , '_wpshop_order_status', true);
-			if ( !empty($order_postmeta) ) {
-				switch ( $order_postmeta ) {
+		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
+		$order_post_id = $wpdb->get_var($query);
+		if (!empty($order_post_id)) {
+			$order_postmeta = get_post_meta($order_post_id, '_wpshop_order_status', true);
+			if (!empty($order_postmeta)) {
+				switch ($order_postmeta) {
 					case 'awaiting_payment':
-						echo __('We wait your payment.','wpshop');
+						echo __('We wait your payment.', 'wpshop');
 					break;
 					case 'completed':
-						echo __('Thank you ! Your payment has been recorded.','wpshop');
+						echo __('Thank you ! Your payment has been recorded.', 'wpshop');
 					break;
 					case 'partially_paid':
-						echo __('Thank you ! Your first payment has been recorded.','wpshop');
+						echo __('Thank you ! Your first payment has been recorded.', 'wpshop');
 					break;
 					default:
-						echo __('Your payment and your order has been cancelled.','wpshop');
+						echo __('Your payment and your order has been cancelled.', 'wpshop');
 					break;
 				}
 			}
@@ -88,56 +88,56 @@ 
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
 	 * @return string The different payment method
 	 */
-	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
+	function __display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
 		$output = '';
 		/**	Get available payment method	*/
 		$paymentMethod = get_option('wpshop_paymentMethod', array());
 
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
 
 		if ($cart_type == 'cart') {
 			$payment_methods = array();
-			if(!empty($paymentMethod['paypal'])) {
+			if (!empty($paymentMethod['paypal'])) {
 				$payment_methods['paypal'] = array('payment_method_name' => __('CB with Paypal', 'wpshop'),
 														'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png',
-														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.','wpshop')
+														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop')
 								 );
 			}
-			if(!empty($paymentMethod['checks'])) {
+			if (!empty($paymentMethod['checks'])) {
 				$payment_methods['check'] = array('payment_method_name' => __('Check', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' => __('Reservation of products upon receipt of the check.','wpshop')
+						'payment_method_explanation' => __('Reservation of products upon receipt of the check.', 'wpshop')
 				);
 			}
-			if(!empty($paymentMethod['banktransfer'])) {
+			if (!empty($paymentMethod['banktransfer'])) {
 				$payment_methods['banktransfer'] = array('payment_method_name' => __('Bank transfer', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' =>__('Reservation of product receipt of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of product receipt of payment.', 'wpshop')
 				);
 			}
-			if(WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
+			if (WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
 				$payment_methods['cic'] = array('payment_method_name' =>__('Credit card', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg',
-						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.', 'wpshop')
 				);
 			}
 			$payment_methods = apply_filters('wpshop_payment_method', $payment_methods);
 
 			$payment_method_table = array();
 
-			if ( !empty( $paymentMethod['display_position'] ) ) {
+			if (!empty($paymentMethod['display_position'])) {
 				$position_determinated = false;
-				foreach ( $paymentMethod['display_position'] as $key => $position) {
-					if ( $position != null) {
+				foreach ($paymentMethod['display_position'] as $key => $position) {
+					if ($position != null) {
 						$position_determinated = true;
 					}
 				}
-				if ( $position_determinated ) {
-					for ( $i = 1; $i < count( $paymentMethod['display_position'] ) + 1; $i++) {
-						foreach ( $paymentMethod['display_position'] as $key => $position ) {
-							if ( $position == $i  && !empty($paymentMethod[$key])) {
+				if ($position_determinated) {
+					for ($i = 1; $i < count($paymentMethod['display_position']) + 1; $i++) {
+						foreach ($paymentMethod['display_position'] as $key => $position) {
+							if ($position == $i && !empty($paymentMethod[$key])) {
 								if ($key == 'checks') {
 									$key = 'check';
 								}
@@ -148,16 +148,16 @@ 
 					$payment_methods = $payment_method_table;
 				}
 			}
-			if (!empty($payment_methods) ) {
+			if (!empty($payment_methods)) {
 
-				foreach( $payment_methods as  $payment_method_identifier =>  $payment_method_def ) {
+				foreach ($payment_methods as  $payment_method_identifier =>  $payment_method_def) {
 					$tpl_component = array();
 					$checked = $active = '';
 					$payment_identifier_for_test = $payment_method_identifier;
 					if ($payment_method_identifier == 'check') {
 						$payment_identifier_for_test = 'checks';
 					}
-					if ( !empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
+					if (!empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
 						$checked = ' checked="checked"';
 						$active = ' active';
 
@@ -165,11 +165,11 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = $active;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = $checked;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
-					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
+					if (!empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? wp_get_attachment_image($payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo')) : '';
 					}
 					else {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? '<img src="' . $payment_method_def['payment_method_icon'] . '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = $payment_method_def['payment_method_name'];
@@ -180,32 +180,32 @@ 
 			}
 		}
 
-		return array( $output, $paymentMethod['mode'] );
+		return array($output, $paymentMethod['mode']);
 	}
 
 
-	public static function display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
-		$payment_option = get_option( 'wps_payment_mode' );
+	public static function display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
+		$payment_option = get_option('wps_payment_mode');
 		$output = '';
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
-		if( $cart_type == 'cart' ) {
-			if ( !empty($payment_option) && !empty($payment_option['mode']) ) {
-				foreach( $payment_option['mode'] as $payment_id => $payment_config ) {
-					if( !empty($payment_config['active']) ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? ' active' : '');
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? 'checked="checked"' : '');
+		if ($cart_type == 'cart') {
+			if (!empty($payment_option) && !empty($payment_option['mode'])) {
+				foreach ($payment_option['mode'] as $payment_id => $payment_config) {
+					if (!empty($payment_config['active'])) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? ' active' : '');
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? 'checked="checked"' : '');
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_id;
 
-						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
+						if (!empty($payment_config['logo']) && (int)$payment_config['logo'] != 0) {
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? wp_get_attachment_image($payment_config['logo'], 'thumbnail', false) : '';
 						}
 						else {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? '<img src="' . $payment_config['logo'] . '" alt="' . $payment_config['name'] . '" />' : '';
 						}
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = ( !empty($payment_config['description']) ) ? $payment_config['description'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = (!empty($payment_config['name'])) ? $payment_config['name'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = (!empty($payment_config['description'])) ? $payment_config['description'] : '';
 						$output .= wpshop_display::display_template_element('wpshop_checkout_page_payment_method_bloc', $tpl_component, array('type' => 'payment_method', 'id' => $payment_id));
 						unset($tpl_component);
 					}
@@ -227,13 +227,13 @@ 
 
 		$wps_message = new wps_message_ctr();
 
-		if(!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
-			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '' );
-			$first_name = ( !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+		if (!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
 			// Envoie du message de confirmation de paiement au client
-			switch($order['payment_method']) {
+			switch ($order['payment_method']) {
 				case 'check':
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']));
 				break;
@@ -250,24 +250,24 @@ 
 	}
 
 
-	function setOrderPaymentStatus( $order_id, $payment_status ) {
+	function setOrderPaymentStatus($order_id, $payment_status) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 		$send_email = false;
 
-		if ( !empty($order) ) {
+		if (!empty($order)) {
 			/**	Change order status to given status	*/
 			$order['order_status'] = strtolower($payment_status);
 			/**	Put order status into a single meta, allowing to use it easily later	*/
 			update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 			/**	In case the set status is completed, make specific treatment: add the completed date	*/
-			if ( $payment_status == 'completed' ) {
+			if ($payment_status == 'completed') {
 				/**	Read order items list, if not empty and check if each item is set to manage stock or not */
 				if (!empty($order['order_items'])) {
 					foreach ($order['order_items'] as $o) {
-						$product = wpshop_products::get_product_data( $o['item_id'] );
-						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop') ) {
+						$product = wpshop_products::get_product_data($o['item_id']);
+						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop')) {
 							wpshop_products::reduce_product_stock_qty($o['item_id'], $o['item_qty']);
 						}
 					}
@@ -281,7 +281,7 @@ 
 			}
 
 			/**	Send email to customer when specific case need it	*/
-			if ( $send_email ) {
+			if ($send_email) {
 				/**	Get information about customer that make the order	*/
 				$order_info = get_post_meta($order_id, '_order_info', true);
 				$mail_tpl_component = array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']);
@@ -295,25 +295,25 @@ 
 	/**
 	* Get payment method
 	*/
-	function get_payment_method($post_id){
-		$pm = __('Nc','wpshop');
+	function get_payment_method($post_id) {
+		$pm = __('Nc', 'wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
-		if ( !empty($order_postmeta['payment_method']) ) {
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
-					$pm = __('Check','wpshop');
+					$pm = __('Check', 'wpshop');
 				break;
 				case 'paypal':
-					$pm = __('Paypal','wpshop');
+					$pm = __('Paypal', 'wpshop');
 				break;
 				case 'banktransfer':
-					$pm = __('Bank transfer','wpshop');
+					$pm = __('Bank transfer', 'wpshop');
 				break;
 				case 'cic':
-					$pm = __('Credit card','wpshop');
+					$pm = __('Credit card', 'wpshop');
 				break;
 				default:
-					$pm = __('Nc','wpshop');
+					$pm = __('Nc', 'wpshop');
 				break;
 			}
 		}
@@ -333,38 +333,38 @@ 
 
 		$paymentMethod = $paymentMethod['mode'];
 		$payment_validation .= '
-<div id="order_payment_method_'.$post_id.'" class="wpshop_cls wpshopHide" >
-	<input type="hidden" id="used_method_payment_'.$post_id.'" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
-	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id.'" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
+<div id="order_payment_method_'.$post_id . '" class="wpshop_cls wpshopHide" >
+	<input type="hidden" id="used_method_payment_'.$post_id . '" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
+	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id . '" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
 
-		if(!empty($order_postmeta['payment_method'])){
+		if (!empty($order_postmeta['payment_method'])) {
 			$payment_validation .= sprintf(__('Selected payment method: %s', 'wpshop'), __($order_postmeta['payment_method'], 'wpshop')) . '<br/>';
 		}
 
-		if(!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="paypal" id="payment_method_paypal" /><label for="payment_method_paypal" >' . __('Paypal', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="check" id="payment_method_check" /><label for="payment_method_check" >' . __('Check', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) ) && empty($order_postmeta['payment_method'])) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if ((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']))) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="cb" id="payment_method_cb" /><label for="payment_method_cb" >' . __('Credit card', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(empty($payment_transaction)){
-			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_'.$post_id.'" />';
+		if (empty($payment_transaction)) {
+			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_' . $post_id . '" />';
 			$display_button = true;
 		}
 
-		if($display_button){
+		if ($display_button) {
 			$payment_validation .= '
-		<br/><br/><a class="button payment_method_validate order_'.$post_id.' wpshop_clear" >'.__('Validate payment method', 'wpshop').'</a>';
+		<br/><br/><a class="button payment_method_validate order_'.$post_id . ' wpshop_clear" >' . __('Validate payment method', 'wpshop') . '</a>';
 		}
 
 		$payment_validation .= '
@@ -379,21 +379,21 @@ 
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
 	 * @return array The amount to pay / A html output with amount to pay and different information
 	 */
-	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
+	function partial_payment_calcul($current_order_total, $for = 'for_all') {
 		$output = '';
 		$tpl_component = array();
 
 		/**	Get current configuration	*/
 		$partial_payment_configuration = get_option('wpshop_payment_partial', array($for => array(), 'for_quotation' => array()));
-		if ( !empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on') ) {
+		if (!empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on')) {
 			$amount_of_partial_payment = 0;
-			if ( !empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate']) ) {
+			if (!empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate'])) {
 				$amount_of_partial_payment = $partial_payment_configuration[$for]['value'];
 			}
 
 			$partial_amount_to_pay = 0;
 			$type_of_partial_payment = null;
-			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type']) ) {
+			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type'])) {
 				switch ($partial_payment_configuration[$for]['type']) {
 					case 'percentage':
 						$type_of_partial_payment = '%';
@@ -453,7 +453,7 @@ 
 	function set_payment_transaction_number($order_id, $transaction_number) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-		if ( !empty($order_postmeta['order_payment']['received']) ) {
+		if (!empty($order_postmeta['order_payment']['received'])) {
 			if (count($order_postmeta['order_payment']['received']) == 1) {
 				$order_postmeta['order_payment']['received'][0]['payment_reference'] = $transaction_number;
 			}
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param integer $order_id
 	 */
-	function save_payment_return_data( $order_id ) {
+	function save_payment_return_data($order_id) {
 		$data = wpshop_tools::getMethode();
 
-		$current_payment_return = get_post_meta( $order_id, '_wpshop_payment_return_data', true);
+		$current_payment_return = get_post_meta($order_id, '_wpshop_payment_return_data', true);
 		$current_payment_return[] = $data;
 
 		update_post_meta($order_id, '_wpshop_payment_return_data', $current_payment_return);
@@ -484,23 +484,23 @@ 
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
 	 * @return array The order new meta informations
 	 */
-	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {
-
-		$order_meta['order_payment']['received'][$payment_index]['method'] = ( !empty($params['method']) ) ? $params['method'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = ( !empty($params['waited_amount']) ) ? $params['waited_amount'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['status'] = ( !empty($params['status']) ) ? $params['status'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['author'] = ( !empty($params['author']) ) ? $params['author'] : get_current_user_id();
-		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] =( !empty($params['payment_reference']) ) ? $params['payment_reference'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['date'] = ( !empty($params['date']) ) ? $params['date'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = ( !empty($params['received_amount']) ) ? $params['received_amount'] : null;
+	public static function add_new_payment_to_order($order_id, $order_meta, $payment_index, $params, $bank_response) {
+
+		$order_meta['order_payment']['received'][$payment_index]['method'] = (!empty($params['method'])) ? $params['method'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = (!empty($params['waited_amount'])) ? $params['waited_amount'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['status'] = (!empty($params['status'])) ? $params['status'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['author'] = (!empty($params['author'])) ? $params['author'] : get_current_user_id();
+		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] = (!empty($params['payment_reference'])) ? $params['payment_reference'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['date'] = (!empty($params['date'])) ? $params['date'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = (!empty($params['received_amount'])) ? $params['received_amount'] : null;
 		$order_meta['order_payment']['received'][$payment_index]['comment'] = '';
 
 		$order_info = get_post_meta($order_id, '_order_info', true);
-		if(!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
+		if (!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
 
 			/**	Generate an invoice number for the current payment. Check if the payment is complete or not	*/
-			if ( empty($order_meta['order_invoice_ref']) ) {
-				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number( $order_id );
+			if (empty($order_meta['order_invoice_ref'])) {
+				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number($order_id);
 			}
 		}
 
@@ -513,13 +513,13 @@ 
 	 * @param string $payment_method
 	 * @return integer $key : array id of [order_payment][received] in the order postmeta
 	 */
-	public static function get_order_waiting_payment_array_id ( $oid, $payment_method ) {
+	public static function get_order_waiting_payment_array_id($oid, $payment_method) {
 		$key = 0;
-		$order_meta = get_post_meta( $oid, '_order_postmeta', true);
-		if ( !empty($order_meta) ) {
-			$key = count( $order_meta['order_payment']['received'] );
-			foreach ( $order_meta['order_payment']['received'] as $k => $payment_test) {
-				if ( !array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */ ) {
+		$order_meta = get_post_meta($oid, '_order_postmeta', true);
+		if (!empty($order_meta)) {
+			$key = count($order_meta['order_payment']['received']);
+			foreach ($order_meta['order_payment']['received'] as $k => $payment_test) {
+				if (!array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */) {
 					$key = $k;
 				}
 			}
@@ -534,52 +534,52 @@ 
 	 * @param array $params_array
 	 * @return string
 	 */
-	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true ) {
+	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true) {
 		global $wpshop_payment; global $wpdb;
-		$order_meta = ( !empty($order_meta) ) ? $order_meta : get_post_meta( $order_id, '_order_postmeta', true);
+		$order_meta = (!empty($order_meta)) ? $order_meta : get_post_meta($order_id, '_order_postmeta', true);
 
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_meta) ) {
+		if (!empty($order_meta)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
-			$user_data = get_userdata( $order_meta['customer_id'] );
-			$email = ( !empty($user_data) && !empty($user_data->user_email) ) ? $user_data->user_email : '';
+			$user_data = get_userdata($order_meta['customer_id']);
+			$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
 // 			$email = ( !empty($order_info) &&  !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '' ;
-			$first_name = (!empty($order_info) && !empty($order_info['billing']) &&  !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+			$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			$key = self::get_order_waiting_payment_array_id( $order_id, $params_array['method']);
+			$key = self::get_order_waiting_payment_array_id($order_id, $params_array['method']);
 			$order_grand_total = $order_meta['order_grand_total'];
-			$total_received = ( ( !empty($params_array['status']) && ( $params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount']) ) ? $params_array['received_amount'] : 0 );
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+			$total_received = ((!empty($params_array['status']) && ($params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount'])) ? $params_array['received_amount'] : 0);
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 			$order_meta['order_amount_to_pay_now'] = $order_grand_total - $total_received;
-			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order( $order_id, $order_meta, $key, $params_array, $bank_response );
+			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order($order_id, $order_meta, $key, $params_array, $bank_response);
 
 			if ($bank_response == 'completed') {
 
-				if ( number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total,2, '.', '') ) {
+				if (number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total, 2, '.', '')) {
 					$payment_status = 'completed';
 
-					$order_meta['order_invoice_ref'] = ( empty ($order_meta['order_invoice_ref'] ) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : ( empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref'] ) ;
+					$order_meta['order_invoice_ref'] = (empty ($order_meta['order_invoice_ref']) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref'])) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : (empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref']);
 					$order_meta['order_invoice_date'] = current_time('mysql', 0);
 
 					if (!empty($order_meta['order_items'])) {
 						foreach ($order_meta['order_items'] as $item_id => $o) {
 							$pid = $o['item_id'];
-							if (strpos($item_id,'__') !== false) {
-								$product_data_id = explode( '__', $item_id );
-								$pid = ( !empty($product_data_id) && !empty($product_data_id[1]) ) ? $product_data_id[1] : $pid;
+							if (strpos($item_id, '__') !== false) {
+								$product_data_id = explode('__', $item_id);
+								$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $pid;
 							}
-							$product = wpshop_products::get_product_data( $pid );
-							if ( get_post_type( $pid ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation ( $pid );
+							$product = wpshop_products::get_product_data($pid);
+							if (get_post_type($pid) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($pid);
 								$parent_post = $parent_def['parent_post'];
-								$product = wpshop_products::get_product_data( $parent_post->ID );
+								$product = wpshop_products::get_product_data($parent_post->ID);
 							}
 
-							if (!empty($product) && !empty($product['manage_stock']) && strtolower( __($product['manage_stock'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) {
-								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid );
+							if (!empty($product) && !empty($product['manage_stock']) && strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid);
 							}
 						}
 					}
@@ -588,45 +588,45 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					/** Check if the order content a downloadable product **/
-					if ( !empty($order_meta['order_items']) ) {
-						foreach( $order_meta['order_items'] as $key_value => $item ) {
+					if (!empty($order_meta['order_items'])) {
+						foreach ($order_meta['order_items'] as $key_value => $item) {
 							$key_value = $item['item_id'];
 							/** Check if it's a product with signle variation, check the parent product **/
-							if ( !empty($item['item_id']) && get_post_type( $item['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_item = wpshop_products::get_parent_variation( $item['item_id'] );
+							if (!empty($item['item_id']) && get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_item = wpshop_products::get_parent_variation($item['item_id']);
 								$key_value = $parent_item['parent_post']->ID;
 								$parent_post_metadata = $parent_item['parent_post_meta'];
-								if ( !empty($parent_post_metadata['is_downloadable_']) ) {
-									$query = $wpdb->prepare( 'SELECT value FROM '. WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS .' WHERE id = %d', $parent_post_metadata['is_downloadable_'] );
-									$downloadable_option_value = $wpdb->get_var( $query );
-									if ( !empty( $downloadable_option_value) ) {
+								if (!empty($parent_post_metadata['is_downloadable_'])) {
+									$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_post_metadata['is_downloadable_']);
+									$downloadable_option_value = $wpdb->get_var($query);
+									if (!empty($downloadable_option_value)) {
 										$item['item_is_downloadable_'] = $downloadable_option_value;
 									}
 
 								}
 							}
 
-							if ( !empty($item) && !empty($item['item_is_downloadable_']) && ( strtolower( __( $item['item_is_downloadable_'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) ) {
-								$download_codes = get_user_meta($order_meta['customer_id'], '_order_download_codes_'.$order_id, true);
+							if (!empty($item) && !empty($item['item_is_downloadable_']) && (strtolower(__($item['item_is_downloadable_'], 'wpshop')) == strtolower(__('Yes', 'wpshop')))) {
+								$download_codes = get_user_meta($order_meta['customer_id'], '_order_download_codes_' . $order_id, true);
 
-								if ( !empty($download_codes) && !empty($download_codes[$key_value]) && !empty($download_codes[$key_value]['download_code']) ) {
-									$link = '<a href="' . admin_url( 'admin-post.php?action=wps_download_file&amp;oid=' . $order_id . '&amp;download=' . $download_codes[$key_value]['download_code'] ) . '">' . __('Download','wpshop') . '</a>';
-									$wps_message->wpshop_prepared_email($email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link), array() );
+								if (!empty($download_codes) && !empty($download_codes[$key_value]) && !empty($download_codes[$key_value]['download_code'])) {
+									$link = '<a href="' . admin_url('admin-post.php?action=wps_download_file&amp;oid=' . $order_id . '&amp;download=' . $download_codes[$key_value]['download_code']) . '">' . __('Download', 'wpshop') . '</a>';
+									$wps_message->wpshop_prepared_email($email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link), array());
 								}
 							}
 						}
 					}
 
 					// Send confirmation e-mail to administrator
-					if ( empty($_SESSION['wps-pos-addon']) ) {
+					if (empty($_SESSION['wps-pos-addon'])) {
 						$email_option = get_option('wpshop_emails');
-						if(  !empty($email_option) && !empty($email_option['send_confirmation_order_message']) ){
-							wpshop_checkout::send_order_email_to_administrator( $order_id, $user_data );
+						if (!empty($email_option) && !empty($email_option['send_confirmation_order_message'])) {
+							wpshop_checkout::send_order_email_to_administrator($order_id, $user_data);
 						}
 					}
 
 					// POS Status
-					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
+					if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos') {
 						$payment_status = 'pos';
 					}
 				}
@@ -635,27 +635,27 @@ 
 				}
 
 				$order_meta['order_status'] = $payment_status;
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				$save_metadata = false;
 
-				$allow_send_invoice = get_option( 'wpshop_send_invoice' );
-				$invoice_attachment_file = ( !empty($allow_send_invoice) ) ? wpshop_modules_billing::generate_invoice_for_email( $order_id, empty( $order_meta['order_payment']['received'][$key]['invoice_ref'] ) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref'] ) : '';
+				$allow_send_invoice = get_option('wpshop_send_invoice');
+				$invoice_attachment_file = (!empty($allow_send_invoice)) ? wpshop_modules_billing::generate_invoice_for_email($order_id, empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref']) : '';
 
-				$email_option = get_option( 'wpshop_emails' );
+				$email_option = get_option('wpshop_emails');
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				$payment_method_option = get_option( 'wps_payment_mode' );
-				$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode'])  && !empty($order_meta['order_payment']['customer_choice']['method'])  && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+				$payment_method_option = get_option('wps_payment_mode');
+				$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-				if ( !empty( $email_option ) && !empty( $email_option['send_confirmation_order_message'] ) && $payment_status == 'completed'
-						&& ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method ) );
+				if (!empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed'
+						&& (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email']))) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method));
 				}
 
-				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
-					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
+				if (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
 			}
 			else {
@@ -663,13 +663,13 @@ 
 			}
 
 			$order_meta['order_status'] = $payment_status;
-			if( !$save_metadata ) {
+			if (!$save_metadata) {
 				return 	$order_meta;
 			}
 			else {
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
-			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);
+			update_post_meta($order_id, '_wpshop_order_status', $payment_status);
 		}
 	}
 
@@ -681,11 +681,11 @@ 
 	 * @param integer $order_id The order identifier we want to get the old transaction reference for
 	 * @return integer
 	 */
-	public static function get_payment_transaction_number_old_way($order_id){
+	public static function get_payment_transaction_number_old_way($order_id) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 		$transaction_indentifier = 0;
-		if(!empty($order_postmeta['payment_method'])){
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
 					$transaction_indentifier = get_post_meta($order_id, '_order_check_number', true);
 					break;
@@ -704,26 +704,26 @@ 
 		return $transaction_indentifier;
 	}
 
-	public static function reverify_payment_invoice_ref( $order_id, $index_payment ) {
+	public static function reverify_payment_invoice_ref($order_id, $index_payment) {
 		$status = false;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if( !empty( $order_meta ) && !empty( $order_meta['order_payment'] ) && !empty( $order_meta['order_payment']['received'] ) && !empty( $order_meta['order_payment']['received'][$index_payment] ) && empty( $order_meta['order_payment']['received'][$index_payment]['invoice_ref'] ) ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) && !empty($order_meta['order_payment']['received'][$index_payment]) && empty($order_meta['order_payment']['received'][$index_payment]['invoice_ref'])) {
 			$order_invoice = $invoice_ref = false;
 
-			end( $order_meta['order_payment']['received'] );
-			$last_payment = key( $order_meta['order_payment']['received'] );
-			if( $last_payment == $index_payment ) {
+			end($order_meta['order_payment']['received']);
+			$last_payment = key($order_meta['order_payment']['received']);
+			if ($last_payment == $index_payment) {
 				$payments = 0;
-				foreach( $order_meta['order_payment']['received'] as $payment ) {
-					$payments += ( $payment['status'] == 'payment_received' ) ? $payment['received_amount'] : 0;
+				foreach ($order_meta['order_payment']['received'] as $payment) {
+					$payments += ($payment['status'] == 'payment_received') ? $payment['received_amount'] : 0;
 				}
-				if( $order_meta['order_grand_total'] <= $payments ) {
-					if( $order_meta['order_status'] == 'partially_paid' ) {
-						$order_status_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
+				if ($order_meta['order_grand_total'] <= $payments) {
+					if ($order_meta['order_status'] == 'partially_paid') {
+						$order_status_meta = get_post_meta($order_id, '_wpshop_order_status', true);
 						$order_meta['order_status'] = 'completed';
-						$status = (bool)update_post_meta( $order_id, '_wpshop_order_status', 'completed' );
+						$status = (bool)update_post_meta($order_id, '_wpshop_order_status', 'completed');
 					}
-					if( !empty( $order_meta['order_invoice_ref'] ) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 						$status = true;
 					} else {
@@ -734,16 +734,16 @@ 
 				$status = true;
 			}
 
-			if( $status ) {
-				if( empty( $invoice_ref ) ) {
-					$invoice_ref = wpshop_modules_billing::generate_invoice_number( $order_id );
-					if( $order_invoice ) {
+			if ($status) {
+				if (empty($invoice_ref)) {
+					$invoice_ref = wpshop_modules_billing::generate_invoice_number($order_id);
+					if ($order_invoice) {
 						$order_meta['order_invoice_ref'] = $invoice_ref;
 					}
 				}
 
 				$order_meta['order_payment']['received'][$index_payment]['invoice_ref'] = $invoice_ref;
-				$status = (bool)update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				$status = (bool)update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
 		return $status;

Braces +13 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -40,9 +42,11 @@ 
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if($interoguation_marker_pos===false) {
+					return $url.'?'.$param.'='.$value;
+		} else {
+			return $url.'&'.$param.'='.$value;
+		}
 	}
 
 	/**
@@ -167,8 +171,7 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
 					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
-					}
-					else {
+					} else {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
@@ -200,8 +203,7 @@ 
 
 						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
-						}
-						else {
+						} else {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
 						}
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
@@ -629,8 +631,7 @@ 
 					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
 						$payment_status = 'pos';
 					}
-				}
-				else {
+				} else {
 					$payment_status = 'partially_paid';
 				}
 
@@ -657,16 +658,14 @@ 
 				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
 					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
-			}
-			else {
+			} else {
 				$payment_status = $bank_response;
 			}
 
 			$order_meta['order_status'] = $payment_status;
 			if( !$save_metadata ) {
 				return 	$order_meta;
-			}
-			else {
+			} else {
 				update_post_meta( $order_id, '_order_postmeta', $order_meta);
 			}
 			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);

includes/librairies/payments/cic.class.php

Indentation +16 added lines, -16 removed lines

@@ -198,22 +198,22 @@
 // ----------------------------------------------------------------------------
 function HtmlEncode ($data)
 {
-    $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
-    $encoded_data = "";
-    $result = "";
-    for ($i=0; $i<strlen($data); $i++)
-    {
-        if (strchr($SAFE_OUT_CHARS, $data{$i})) {
-            $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
-            $result .= "&#x" . $var . ";";
-        }
-        else
-            $result .= $data{$i};
-
-    }
-    return $result;
+	$SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
+	$encoded_data = "";
+	$result = "";
+	for ($i=0; $i<strlen($data); $i++)
+	{
+		if (strchr($SAFE_OUT_CHARS, $data{$i})) {
+			$result .= $data{$i};
+		}
+		else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+			$result .= "&#x" . $var . ";";
+		}
+		else
+			$result .= $data{$i};
+
+	}
+	return $result;
 }
 
 class wpshop_CIC {

Braces +18 added lines, -16 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -81,9 +83,10 @@ 
 
 	private function _checkTpeParams($aConstants) {
 
-		for ($i = 0; $i < count($aConstants); $i++)
-			if (!defined($aConstants[$i]))
+		for ($i = 0; $i < count($aConstants); $i++) {
+					if (!defined($aConstants[$i]))
 				die ("Erreur param�tre " . $aConstants[$i] . " ind�fini");
+		}
 	}
 
 }
@@ -126,13 +129,14 @@ 
 
 		$cca0=ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
-		else {
-			if (substr($hexFinal, 1, 1)=="M")
-				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
-			else
-				$hexStrKey .= substr($hexFinal, 0, 2);
+		if ($cca0>70 && $cca0<97) {
+					$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		} else {
+			if (substr($hexFinal, 1, 1)=="M") {
+							$hexStrKey .= substr($hexFinal, 0, 1) . "0";
+			} else {
+							$hexStrKey .= substr($hexFinal, 0, 2);
+			}
 		}
 
 		return pack("H*", $hexStrKey);
@@ -205,12 +209,11 @@ 
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        } else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
             $result .= "&#x" . $var . ";";
+        } else {
+                    $result .= $data{$i};
         }
-        else
-            $result .= $data{$i};
 
     }
     return $result;
@@ -329,8 +332,7 @@ 
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
 			$receipt = CMCIC_CGI2_MACOK;
-		}
-		else {
+		} else {
 			// your code if the HMAC doesn't match
 			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
 		}

Spacing +81 added lines, -81 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 
@@ -13,11 +13,11 @@ 
 ***************************************************************************************/
 
 
-define("CMCIC_CTLHMAC","V1.04.sha1.php--[CtlHmac%s%s]-%s");
+define("CMCIC_CTLHMAC", "V1.04.sha1.php--[CtlHmac%s%s]-%s");
 define("CMCIC_CTLHMACSTR", "CtlHmac%s%s");
-define("CMCIC_CGI2_RECEIPT","version=2\ncdr=%s");
-define("CMCIC_CGI2_MACOK","0");
-define("CMCIC_CGI2_MACNOTOK","1\n");
+define("CMCIC_CGI2_RECEIPT", "version=2\ncdr=%s");
+define("CMCIC_CGI2_MACOK", "0");
+define("CMCIC_CGI2_MACNOTOK", "1\n");
 define("CMCIC_CGI2_FIELDS", "%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*");
 define("CMCIC_CGI1_FIELDS", "%s*%s*%s%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s");
 define("CMCIC_URLPAIEMENT", "paiement.cgi");
@@ -25,15 +25,15 @@ 
 class CMCIC_Tpe {
 
 
-	public $sVersion;	// Version du TPE - TPE Version (Ex : 3.0)
-	public $sNumero;	// Numero du TPE - TPE Number (Ex : 1234567)
-	public $sCodeSociete;	// Code Societe - Company code (Ex : companyname)
-	public $sLangue;	// Langue - Language (Ex : FR, DE, EN, ..)
-	public $sUrlOK;		// Url de retour OK - Return URL OK
-	public $sUrlKO;		// Url de retour KO - Return URL KO
-	public $sUrlPaiement;	// Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
+	public $sVersion; // Version du TPE - TPE Version (Ex : 3.0)
+	public $sNumero; // Numero du TPE - TPE Number (Ex : 1234567)
+	public $sCodeSociete; // Code Societe - Company code (Ex : companyname)
+	public $sLangue; // Langue - Language (Ex : FR, DE, EN, ..)
+	public $sUrlOK; // Url de retour OK - Return URL OK
+	public $sUrlKO; // Url de retour KO - Return URL KO
+	public $sUrlPaiement; // Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
 
-	private $_sCle;		// La cl� - The Key
+	private $_sCle; // La cl� - The Key
 
 
 	// Constructeur / Constructor
@@ -52,8 +52,8 @@ 
 		$this->sCodeSociete = CMCIC_CODESOCIETE;
 		$this->sLangue = $sLangue;
 
-		$this->sUrlOK = wpshop_payment::get_success_payment_url();;
-		$this->sUrlKO = wpshop_payment::get_cancel_payment_url();;
+		$this->sUrlOK = wpshop_payment::get_success_payment_url(); ;
+		$this->sUrlKO = wpshop_payment::get_cancel_payment_url(); ;
 
 	}
 
@@ -97,7 +97,7 @@ 
 
 class CMCIC_Hmac {
 
-	private $_sUsableKey;	// La cl� du TPE en format op�rationnel / The usable TPE key
+	private $_sUsableKey; // La cl� du TPE en format op�rationnel / The usable TPE key
 
 	// ----------------------------------------------------------------------------
 	//
@@ -119,17 +119,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	private function _getUsableKey($oTpe){
+	private function _getUsableKey($oTpe) {
 
 		$hexStrKey  = substr($oTpe->getCle(), 0, 38);
 		$hexFinal   = "" . substr($oTpe->getCle(), 38, 2) . "00";
 
-		$cca0=ord($hexFinal);
+		$cca0 = ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		if ($cca0 > 70 && $cca0 < 97)
+			$hexStrKey .= chr($cca0 - 23) . substr($hexFinal, 1, 1);
 		else {
-			if (substr($hexFinal, 1, 1)=="M")
+			if (substr($hexFinal, 1, 1) == "M")
 				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
 			else
 				$hexStrKey .= substr($hexFinal, 0, 2);
@@ -170,17 +170,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	public function hmac_sha1 ($key, $data) {
+	public function hmac_sha1($key, $data) {
 
 		$length = 64; // block length for SHA1
-		if (strlen($key) > $length) { $key = pack("H*",sha1($key)); }
+		if (strlen($key) > $length) { $key = pack("H*", sha1($key)); }
 		$key  = str_pad($key, $length, chr(0x00));
 		$ipad = str_pad('', $length, chr(0x36));
 		$opad = str_pad('', $length, chr(0x5c));
-		$k_ipad = $key ^ $ipad ;
+		$k_ipad = $key ^ $ipad;
 		$k_opad = $key ^ $opad;
 
-		return sha1($k_opad  . pack("H*",sha1($k_ipad . $data)));
+		return sha1($k_opad . pack("H*", sha1($k_ipad . $data)));
 	}
 
 }
@@ -196,17 +196,17 @@ 
 //                           ********************
 //              Encodage des caract�res sp�ciaux au format HTML
 // ----------------------------------------------------------------------------
-function HtmlEncode ($data)
+function HtmlEncode($data)
 {
     $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
     $encoded_data = "";
     $result = "";
-    for ($i=0; $i<strlen($data); $i++)
+    for ($i = 0; $i < strlen($data); $i++)
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
         }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        else if (($var = bin2hex(substr($data, $i, 1))) <= "7F") {
             $result .= "&#x" . $var . ";";
         }
         else
@@ -220,21 +220,21 @@ 
 
 	public function __construct() {
 		global $wpshop;
-		$cic_option = get_option( 'wpshop_addons' );
-		if ( !empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']) ) {
+		$cic_option = get_option('wpshop_addons');
+		if (!empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC'])) {
 			/** Check if SystemPay is registred in Payment Main Option **/
-			$payment_option = get_option( 'wps_payment_mode' );
-			if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('cic', $payment_option['mode']) ) {
+			$payment_option = get_option('wps_payment_mode');
+			if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('cic', $payment_option['mode'])) {
 				$payment_option['mode']['cic']['name'] = __('CIC', 'wpshop');
-				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cic_payment_logo.jpg';
+				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg';
 				$payment_option['mode']['cic']['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
-				update_option( 'wps_payment_mode', $payment_option );
+				update_option('wps_payment_mode', $payment_option);
 			}
 		}
 
-		$paymentListener = !empty( $_GET['paymentListener'] ) ? sanitize_text_field( $_GET['paymentListener'] ) : '';
+		$paymentListener = !empty($_GET['paymentListener']) ? sanitize_text_field($_GET['paymentListener']) : '';
 
-		if(!empty($paymentListener) && $paymentListener=='cic') {
+		if (!empty($paymentListener) && $paymentListener == 'cic') {
 			header("Pragma: no-cache");
 			header("Content-type: text/plain");
 			self::display_response();
@@ -278,7 +278,7 @@ 
 		if ($oHmac->computeHmac($cgi2_fields) == strtolower($CMCIC_bruteVars['MAC'])) {
 			wpshop_payment::save_payment_return_data($CMCIC_bruteVars['reference']);
 			$payment_status = 'denied';
-			switch($CMCIC_bruteVars['code-retour']) {
+			switch ($CMCIC_bruteVars['code-retour']) {
 				case "Annulation" :
 					// Attention : an autorization may still be delivered for this payment
 					//wpshop_payment::setOrderPaymentStatus($CMCIC_bruteVars['reference'], 'denied');
@@ -319,15 +319,15 @@ 
 				break;
 			}
 
-			$order_meta = get_post_meta( $CMCIC_bruteVars['reference'], '_order_postmeta', true);
+			$order_meta = get_post_meta($CMCIC_bruteVars['reference'], '_order_postmeta', true);
 			$params_array = array(
 				'method' => 'cic',
-				'waited_amount' => number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
-				'status' => (($payment_status == 'completed') ? ( ( number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' ) ) ? 'payment_received' : 'incorrect_amount' ) : $payment_status),
+				'waited_amount' => number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
+				'status' => (($payment_status == 'completed') ? ((number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')) ? 'payment_received' : 'incorrect_amount') : $payment_status),
 				'author' => $order_meta['customer_id'],
 				'payment_reference' => $CMCIC_bruteVars['numauto'],
 				'date' => current_time('mysql', 0),
-				'received_amount' => number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' )
+				'received_amount' => number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')
 			);
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
@@ -335,11 +335,11 @@ 
 		}
 		else {
 			// your code if the HMAC doesn't match
-			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
+			$receipt = CMCIC_CGI2_MACNOTOK . $cgi2_fields;
 		}
 
 		// Send receipt to CMCIC server
-		printf (CMCIC_CGI2_RECEIPT, $receipt);
+		printf(CMCIC_CGI2_RECEIPT, $receipt);
 	}
 
 	public static function display_form($oid) {
@@ -349,10 +349,10 @@ 
 		$order_customer_info = get_post_meta($oid, '_order_info', true);
 		//$currency_code = wpshop_tools::wpshop_get_currency($code=true);
 		$current_currency = get_option('wpshop_shop_default_currency');
-		$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-		$currency_code = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT code_iso FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+		$currency_code = $wpdb->get_var($query);
 
-		if(!empty($order) && !empty($currency_code)) {
+		if (!empty($order) && !empty($currency_code)) {
 
 			$sOptions = "";
 			// ----------------------------------------------------------------------------
@@ -360,12 +360,12 @@ 
 			//  That's your job to set actual order fields. Here is a stub.
 			// -----------------------------------------------------------------------------
 			$sReference = $oid; // Reference: unique, alphaNum (A-Z a-z 0-9), 12 characters max
-			$sMontant = number_format($order['order_grand_total'],2,'.',''); // Amount : format  "xxxxx.yy" (no spaces)
+			$sMontant = number_format($order['order_grand_total'], 2, '.', ''); // Amount : format  "xxxxx.yy" (no spaces)
 			$sDevise  = $currency_code; // Currency : ISO 4217 compliant
 			$sTexteLibre = ""; // free texte : a bigger reference, session context for the return on the merchant website
 			$sDate = date("d/m/Y:H:i:s"); // transaction date : format d/m/y:h:m:s
 			$sLangue = "FR"; // Language of the company code
-			$sEmail = $order_customer_info['billing']['address']['address_user_email'];//"dev@eoxia.com"; // customer email
+			$sEmail = $order_customer_info['billing']['address']['address_user_email']; //"dev@eoxia.com"; // customer email
 			///////////////////////////////////////////////////////////////////////////////////////////
 			$sNbrEch = ""; //$sNbrEch = "4"; // between 2 and 4
 			$sDateEcheance1 = ""; // date echeance 1 - format dd/mm/yyyy //$sDateEcheance1 = date("d/m/Y");
@@ -386,7 +386,7 @@ 
 			$CtlHmac = sprintf(CMCIC_CTLHMAC, $oTpe->sVersion, $oTpe->sNumero, $oHmac->computeHmac(sprintf(CMCIC_CTLHMACSTR, $oTpe->sVersion, $oTpe->sNumero)));
 
 			// Data to certify
-			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS,     $oTpe->sNumero,
+			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS, $oTpe->sNumero,
 															$sDate,
 															$sMontant,
 															$sDevise,
@@ -413,30 +413,30 @@ 
 		?>
 		<script type="text/javascript">jQuery(document).ready(function(){ jQuery('#PaymentRequest_cic').submit(); });</script>
 		<div class="paypalPaymentLoading"><span><?php _e('Redirect to the CIC site in progress, please wait...', 'wpshop'); ?></span></div>
-		<form action="<?php echo $oTpe->sUrlPaiement;?>" method="post" id="PaymentRequest_cic">
-			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion;?>" />
-			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero;?>" />
-			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate;?>" />
-			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise;?>" />
-			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference;?>" />
-			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC;?>" />
-			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK;?>" />
-			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue;?>" />
-			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete;?>" />
-			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre);?>" />
-			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail;?>" />
+		<form action="<?php echo $oTpe->sUrlPaiement; ?>" method="post" id="PaymentRequest_cic">
+			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion; ?>" />
+			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero; ?>" />
+			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate; ?>" />
+			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise; ?>" />
+			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference; ?>" />
+			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC; ?>" />
+			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK; ?>" />
+			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue; ?>" />
+			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete; ?>" />
+			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre); ?>" />
+			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail; ?>" />
 			<!-- Uniquement pour le Paiement fractionn� -->
-			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch;?>" />
-			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1;?>" />
-			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1;?>" />
-			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2;?>" />
-			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2;?>" />
-			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3;?>" />
-			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3;?>" />
-			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4;?>" />
-			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4;?>" />
+			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch; ?>" />
+			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1; ?>" />
+			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1; ?>" />
+			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2; ?>" />
+			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2; ?>" />
+			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3; ?>" />
+			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3; ?>" />
+			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4; ?>" />
+			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4; ?>" />
 			<!-- -->
 			<noscript><input type="submit" name="bouton"              id="bouton"         value="Connexion / Connection" /></noscript>
 		</form>
@@ -447,16 +447,16 @@ 
 		return $output;
 	}
 
-	public static function display_admin_part( $k ) {
+	public static function display_admin_part($k) {
 		$cmcic_params = get_option('wpshop_cmcic_params', array());
 		$output = '';
-		$output .= '<h2>' .__('CIC configurations', 'wpshop'). '</h2>';
+		$output .= '<h2>' . __('CIC configurations', 'wpshop') . '</h2>';
 		$output .= '<div class="wps_shipping_mode_configuration_part">';
-		$output .= '<label class="simple_right">'.__('Key', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'cle' ] ) ? $cmcic_params['cle'] : '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('TPE', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'tpe' ] ) ? $cmcic_params['tpe']: '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('Version', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'version' ] ) ? $cmcic_params['version']: '' ).'" /> => 3.0<br />';
-		$output .= '<label class="simple_right">'.__('Serveur', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'serveur' ] ) ? $cmcic_params['serveur']: '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('Company code', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'codesociete' ] ) ? $cmcic_params['codesociete']: '' ).'" /><br />';
+		$output .= '<label class="simple_right">' . __('Key', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['cle']) ? $cmcic_params['cle'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('TPE', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['tpe']) ? $cmcic_params['tpe'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Version', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['version']) ? $cmcic_params['version'] : '') . '" /> => 3.0<br />';
+		$output .= '<label class="simple_right">' . __('Serveur', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['serveur']) ? $cmcic_params['serveur'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Company code', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['codesociete']) ? $cmcic_params['codesociete'] : '') . '" /><br />';
 		$output .= '</div>';
 
 		return $output;

includes/librairies/payments/paypal.class.php

Indentation +2 added lines, -2 removed lines

@@ -149,8 +149,8 @@
 	}
 
 	/**
-	* Display the paypal form in order to redirect correctly to paypal
-	*/
+	 * Display the paypal form in order to redirect correctly to paypal
+	 */
 	public static function display_form($oid) {
 		global $wpdb;
 		$order = get_post_meta($oid, '_order_postmeta', true);

Braces +13 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -45,8 +47,7 @@ 
 			if($paypalMode == 'sandbox') {
 				$fp = fsockopen ('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.sandbox.paypal.com";
-			}
-			else {
+			} else {
 				$fp = fsockopen ('ssl://www.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.paypal.com";
 			}
@@ -84,8 +85,7 @@ 
 
 			if (!$fp){
 				echo 'HTTP ERROR!';
-			}
-			else {
+			} else {
 				fputs ($fp, $header.$req);
 				while (!feof($fp)) {
 					$res = fgets ($fp, 1024);
@@ -113,13 +113,11 @@ 
 								/*	Check if the paid amount is equal to the order amount	*/
 								if ( $amount_paid == $amount2pay ) {
 									$payment_status = 'completed';
-								}
-								else {
+								} else {
 									$payment_status = 'incorrect_amount';
 								}
 
-							}
-							else {
+							} else {
 								@mail($notify_email, 'VERIFIED DUPLICATED TRANSACTION', 'VERIFIED DUPLICATED TRANSACTION');
 								$payment_status = 'completed';
 							}
@@ -164,8 +162,11 @@ 
 			if(!empty($paypalBusinessEmail)) {
 
 				$paypalMode = get_option('wpshop_paypalMode', null);
-				if($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-				else $paypal = 'https://www.paypal.com/cgi-bin/webscr';
+				if($paypalMode == 'sandbox') {
+					$paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+				} else {
+					$paypal = 'https://www.paypal.com/cgi-bin/webscr';
+				}
 
 				$current_currency = get_option('wpshop_shop_default_currency');
 				$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
@@ -202,8 +203,7 @@ 
 									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
 									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
 									';
-				}
-				else {
+				} else {
 
 					$output .=	'
 									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$order['order_key']. '" />

Spacing +64 added lines, -64 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -18,38 +18,38 @@ 
 class wpshop_paypal {
 
 	public function __construct() {
-		add_filter( 'wps_payment_mode_interface_paypal', array( &$this, 'display_admin_part') );
+		add_filter('wps_payment_mode_interface_paypal', array(&$this, 'display_admin_part'));
 
 		/** Check if SystemPay is registred in Payment Main Option **/
-		$payment_option = get_option( 'wps_payment_mode' );
-		if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('paypal', $payment_option['mode']) ) {
+		$payment_option = get_option('wps_payment_mode');
+		if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('paypal', $payment_option['mode'])) {
 			$payment_option['mode']['paypal']['name'] = __('Paypal', 'wpshop');
-			$payment_option['mode']['paypal']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/paypal.png';
+			$payment_option['mode']['paypal']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png';
 			$payment_option['mode']['paypal']['description'] = __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop');
-			update_option( 'wps_payment_mode', $payment_option );
+			update_option('wps_payment_mode', $payment_option);
 		}
 
-		$payment_listener = !empty( $_GET['paymentListener'] ) ? sanitize_text_field( $_GET['paymentListener'] ) : '';
+		$payment_listener = !empty($_GET['paymentListener']) ? sanitize_text_field($_GET['paymentListener']) : '';
 
-		if(!empty($payment_listener) && $payment_listener=='paypal') {
+		if (!empty($payment_listener) && $payment_listener == 'paypal') {
 			$payment_status = 'denied';
 			// read the post from PayPal system and add 'cmd'
 			$req = 'cmd=_notify-validate';
 			// @TODO : REQUEST
-			$post = !empty($_POST) ? (array) $_POST : array();
-			foreach ( $post as $key => $value) {
+			$post = !empty($_POST) ? (array)$_POST : array();
+			foreach ($post as $key => $value) {
 				$value = urlencode(stripslashes($value));
 				$req .= "&$key=$value";
 			}
 
 			// If testing on Sandbox use:
 			$paypalMode = get_option('wpshop_paypalMode', null);
-			if($paypalMode == 'sandbox') {
-				$fp = fsockopen ('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
+			if ($paypalMode == 'sandbox') {
+				$fp = fsockopen('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.sandbox.paypal.com";
 			}
 			else {
-				$fp = fsockopen ('ssl://www.paypal.com', 443, $errno, $errstr, 30);
+				$fp = fsockopen('ssl://www.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.paypal.com";
 			}
 
@@ -64,45 +64,45 @@ 
 			$shipping = $_POST['mc_shipping']; // frais de livraison
 			$business = $_POST['business']; // compte pro
 			$order_id = (int)$_POST['invoice']; // num de facture
-			$receiver_email = sanitize_text_field( $_POST['receiver_email'] );
+			$receiver_email = sanitize_text_field($_POST['receiver_email']);
 			$amount_paid = $_POST['mc_gross']; // total (hors frais livraison)
 			$txn_id = $_POST['txn_id']; // num�ro de transaction
 			$payment_status = $_POST['payment_status']; // status du paiement
 			$payer_email = $_POST['payer_email']; // email du client
-			$txn_type = sanitize_text_field( $_POST['txn_type'] );
+			$txn_type = sanitize_text_field($_POST['txn_type']);
 
 			// @TODO : REQUEST
-			$post = !empty($_POST) ? (array) $_POST : array();
-			if ( !empty($post) ) {
-				foreach ( $post as $key => $value) {
-					if ( substr($key, 0, 9) == 'item_name' ) {
+			$post = !empty($_POST) ? (array)$_POST : array();
+			if (!empty($post)) {
+				foreach ($post as $key => $value) {
+					if (substr($key, 0, 9) == 'item_name') {
 						//$_POST[$key] = htmlentities($value);
 					}
 				}
 			}
 
 			/**	Save paypal return data automatically	*/
-			wpshop_payment::save_payment_return_data( $order_id );
+			wpshop_payment::save_payment_return_data($order_id);
 
 			$notify_email = get_option('wpshop_paypalEmail', null); // email address to which debug emails are sent to
 
-			if (!$fp){
+			if (!$fp) {
 				echo 'HTTP ERROR!';
 			}
 			else {
-				fputs ($fp, $header.$req);
+				fputs($fp, $header . $req);
 				while (!feof($fp)) {
-					$res = fgets ($fp, 1024);
-					if (strcmp ($res, "VERIFIED") == 0) {
+					$res = fgets($fp, 1024);
+					if (strcmp($res, "VERIFIED") == 0) {
 						$paypalBusinessEmail = get_option('wpshop_paypalEmail', null);
 
 						/**	Check if payment has been send to good paypal account	*/
 						if ($receiver_email == $paypalBusinessEmail) {
 							/**	Get the payment transaction identifier	*/
-							$paypal_txn_id = wpshop_payment::get_payment_transaction_number( $order_id,  wpshop_payment::get_order_waiting_payment_array_id( $order_id, 'paypal'));
+							$paypal_txn_id = wpshop_payment::get_payment_transaction_number($order_id, wpshop_payment::get_order_waiting_payment_array_id($order_id, 'paypal'));
 
 							/**	If no transaction reference has been saved for this order	*/
-							if ( empty($paypal_txn_id) ) {
+							if (empty($paypal_txn_id)) {
 								/**	Set the payment reference for the order	*/
 								wpshop_payment::set_payment_transaction_number($order_id, $txn_id);
 
@@ -115,7 +115,7 @@ 
 								$amount_paid = number_format(floatval($amount_paid), 2, '.', '');
 
 								/*	Check if the paid amount is equal to the order amount	*/
-								if ( $amount_paid == $amount2pay ) {
+								if ($amount_paid == $amount2pay) {
 									$payment_status = 'completed';
 								}
 								else {
@@ -130,7 +130,7 @@ 
 						}
 					}
 					// if the IPN POST was 'INVALID'...do this
-					elseif (strcmp ($res, "INVALID") == 0) {
+					elseif (strcmp($res, "INVALID") == 0) {
 						@mail($notify_email, "INVALID IPN", "$res\n $req");
 						$payment_status = 'payment_refused';
 					}
@@ -138,15 +138,15 @@ 
 				fclose($fp);
 			}
 
-			$mc_gross = !empty( $_POST['mc_gross'] ) ? (float)$_POST['mc_gross'] : 0;
+			$mc_gross = !empty($_POST['mc_gross']) ? (float)$_POST['mc_gross'] : 0;
 
 			$params_array = array('method' => 'paypal',
 					'waited_amount' => number_format((float)$order['order_amount_to_pay_now'], 2, '.', ''),
-					'status' => ( ( number_format((float)$order['order_amount_to_pay_now'], 2, '.', '') == number_format($mc_gross, 2, '.', '') ) ? 'payment_received' : 'incorrect_amount' ),
+					'status' => ((number_format((float)$order['order_amount_to_pay_now'], 2, '.', '') == number_format($mc_gross, 2, '.', '')) ? 'payment_received' : 'incorrect_amount'),
 					'author' => $order['customer_id'],
 					'payment_reference' => $txn_id,
 					'date' => current_time('mysql', 0),
-					'received_amount' => number_format($mc_gross, 2, '.', '') );
+					'received_amount' => number_format($mc_gross, 2, '.', ''));
 			wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 
 		}
@@ -162,25 +162,25 @@ 
 		$order = get_post_meta($oid, '_order_postmeta', true);
 
 		// If the order exist
-		if(!empty($order)) {
+		if (!empty($order)) {
 
 			$paypalBusinessEmail = get_option('wpshop_paypalEmail', null);
 
 			// Si l'email Paypal n'est pas vide
-			if(!empty($paypalBusinessEmail)) {
+			if (!empty($paypalBusinessEmail)) {
 
 				$paypalMode = get_option('wpshop_paypalMode', null);
-				if($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+				if ($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
 				else $paypal = 'https://www.paypal.com/cgi-bin/webscr';
 
 				$current_currency = get_option('wpshop_shop_default_currency');
-				$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
+				$query = $wpdb->prepare('SELECT code_iso FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
 				$currency = $wpdb->get_var($query);
 
 				$output  = '<script type="text/javascript">jQuery(document).ready(function(){ jQuery("#paypalForm").submit(); });</script>';
 				$output .= '<div class="paypalPaymentLoading"><span>' . __('Redirecting to paypal. Please wait', 'wpshop') . '</span></div>';
 				$output .= '
-						<form action="'.$paypal.'" id="paypalForm" method="post">
+						<form action="'.$paypal . '" id="paypalForm" method="post">
 						<input id="cmd" name="cmd" type="hidden" value="_cart" />
 						<input id="upload" name="upload" type="hidden" value="1" />
 						<input id="charset" name="charset" type="hidden" value="utf-8" />
@@ -188,41 +188,41 @@ 
 						<input id="no_note" name="no_note" type="hidden" value="0" />
 						<input id="rm" name="rm" type="hidden" value="0" />
 
-						<input id="custom" name="custom" type="hidden" value="'.$order['customer_id'].'" />
-						<input id="invoice" name="invoice" type="hidden" value="'.$oid.'" /> <!-- Invoice number -->
-						<input id="business" name="business" type="hidden" value="'.$paypalBusinessEmail.'" /> <!-- Paypal business account -->
+						<input id="custom" name="custom" type="hidden" value="'.$order['customer_id'] . '" />
+						<input id="invoice" name="invoice" type="hidden" value="'.$oid . '" /> <!-- Invoice number -->
+						<input id="business" name="business" type="hidden" value="'.$paypalBusinessEmail . '" /> <!-- Paypal business account -->
 						<input id="cbt" name="cbt" type="hidden" value="' . __('Back to shop', 'wpshop') . '" />
 						<input id="lc" name="lc" type="hidden" value="FR" />
-						<input id="currency_code" name="currency_code" type="hidden" value="'.$currency.'" />
+						<input id="currency_code" name="currency_code" type="hidden" value="'.$currency . '" />
 
-						<input id="return" name="return" type="hidden" value="'.wpshop_payment::get_success_payment_url().'" />
-						<input id="cancel_return" name="cancel_return" type="hidden" value="'.wpshop_payment::get_cancel_payment_url().'" />
-						<input id="notify_url" name="notify_url" type="hidden" value="'.wpshop_payment::construct_url_parameters(trailingslashit(home_url()), 'paymentListener', 'paypal').'" />
+						<input id="return" name="return" type="hidden" value="'.wpshop_payment::get_success_payment_url() . '" />
+						<input id="cancel_return" name="cancel_return" type="hidden" value="'.wpshop_payment::get_cancel_payment_url() . '" />
+						<input id="notify_url" name="notify_url" type="hidden" value="'.wpshop_payment::construct_url_parameters(trailingslashit(home_url()), 'paymentListener', 'paypal') . '" />
 				';
 
-				$i=1;
-				if ( !empty( $order['order_partial_payment']) && !empty($order['order_partial_payment']['amount_of_partial_payment']) ) {
-					$output .=	'
-									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$oid. '_partial_payment" />
-									<input id="item_name_'.$i.'" name="item_name_'.$i.'" type="hidden" value="'.__('Partial payment', 'wpshop').' (' .__('Order number', 'wpshop'). ' : ' .$order['order_key']. ')" />
-									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
-									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
+				$i = 1;
+				if (!empty($order['order_partial_payment']) && !empty($order['order_partial_payment']['amount_of_partial_payment'])) {
+					$output .= '
+									<input id="item_number_'.$i . '" name="item_number_' . $i . '" type="hidden" value="' . $oid . '_partial_payment" />
+									<input id="item_name_'.$i . '" name="item_name_' . $i . '" type="hidden" value="' . __('Partial payment', 'wpshop') . ' (' . __('Order number', 'wpshop') . ' : ' . $order['order_key'] . ')" />
+									<input id="quantity_'.$i . '" name="quantity_' . $i . '" type="hidden" value="1" />
+									<input id="amount_'.$i . '" name="amount_' . $i . '" type="hidden" value="' . number_format($order['order_amount_to_pay_now'], 2, '.', '') . '" />
 									';
 				}
 				else {
 
-					$output .=	'
-									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$order['order_key']. '" />
-									<input id="item_name_'.$i.'" name="item_name_'.$i.'" type="hidden" value="' .__('Current order', 'wpshop'). ' : ' .$order['order_key']. '" />
-									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
-									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
+					$output .= '
+									<input id="item_number_'.$i . '" name="item_number_' . $i . '" type="hidden" value="' . $order['order_key'] . '" />
+									<input id="item_name_'.$i . '" name="item_name_' . $i . '" type="hidden" value="' . __('Current order', 'wpshop') . ' : ' . $order['order_key'] . '" />
+									<input id="quantity_'.$i . '" name="quantity_' . $i . '" type="hidden" value="1" />
+									<input id="amount_'.$i . '" name="amount_' . $i . '" type="hidden" value="' . number_format($order['order_amount_to_pay_now'], 2, '.', '') . '" />
 									';
 
 				}
 
 
 
-				$output .=	'<noscript><input type="submit" value="' . __('Checkout', 'wpshop') . '" /></noscript></form>';
+				$output .= '<noscript><input type="submit" value="' . __('Checkout', 'wpshop') . '" /></noscript></form>';
 			}
 		}
 
@@ -232,16 +232,16 @@ 
 
 	function display_admin_part() {
 		$paypalEmail = get_option('wpshop_paypalEmail');
-		$paypalMode = get_option('wpshop_paypalMode',0);
+		$paypalMode = get_option('wpshop_paypalMode', 0);
 		$output  = '<div class="wps-boxed">';
-		$output .= '<div class="wps-form-group"><label>'.__('Business email','wpshop').'</label><div class="wps-form"><input name="wpshop_paypalEmail" type="text" value="'.$paypalEmail.'" /></div></div>';
-		$output .= '<label class="simple_right">'.__('Mode','wpshop').'</label>';
+		$output .= '<div class="wps-form-group"><label>' . __('Business email', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paypalEmail" type="text" value="' . $paypalEmail . '" /></div></div>';
+		$output .= '<label class="simple_right">' . __('Mode', 'wpshop') . '</label>';
 		$output .= '<div class="wps-form"><select name="wpshop_paypalMode">';
-		$output .= '<option value="normal"'.(($paypalMode=='sandbox') ? null : ' selected="selected"').'>'.__('Production mode','wpshop').'</option>';
-		$output .= '<option value="sandbox"'.(($paypalMode=='sandbox') ? ' selected="selected"' : null).'>'.__('Sandbox mode','wpshop').'</option>';
+		$output .= '<option value="normal"' . (($paypalMode == 'sandbox') ? null : ' selected="selected"') . '>' . __('Production mode', 'wpshop') . '</option>';
+		$output .= '<option value="sandbox"' . (($paypalMode == 'sandbox') ? ' selected="selected"' : null) . '>' . __('Sandbox mode', 'wpshop') . '</option>';
 		$output .= '</select>';
 		$output .= '</div>';
-		$output .= '<a href="#" title="'.__('This checkbox allow to use Paypal in Sandbox mode (test) or production mode (real money)','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$output .= '<a href="#" title="' . __('This checkbox allow to use Paypal in Sandbox mode (test) or production mode (real money)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		$output .= '</div>';
 		return $output;
 	}