Eoxia / wpshop

includes/librairies/HTML2PDF/html2pdf.class.php

Doc Comments +16 added lines, -19 removed lines

@@ -117,11 +117,11 @@ 
          *
          * @access public
          * @param  string   $orientation page orientation, same as TCPDF
-         * @param  mixed    $format      The format used for pages, same as TCPDF
+         * @param  string    $format      The format used for pages, same as TCPDF
          * @param  $tring   $langue      Langue : fr, en, it...
          * @param  boolean  $unicode     TRUE means that the input text is unicode (default = true)
          * @param  String   $encoding    charset encoding; default is UTF-8
-         * @param  array    $marges      Default marges (left, top, right, bottom)
+         * @param  integer[]    $marges      Default marges (left, top, right, bottom)
          * @return HTML2PDF $this
          */
         public function __construct($orientation = 'P', $format = 'A4', $langue='fr', $unicode=true, $encoding='UTF-8', $marges = array(5, 5, 5, 8))
@@ -282,7 +282,6 @@ 
          * @access public
          * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
          * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-         * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
          * @return HTML2PDF $this
          * @see TCPDF::addFont
          */
@@ -413,6 +412,7 @@ 
          *
          * @access public
          * @param  string HTML of a real page
+         * @param string $html
          * @return string HTML adapted to HTML2PDF
          */
         public function getHtmlFromPage($html)
@@ -474,7 +474,7 @@ 
          * display the content in HTML moden for debug
          *
          * @access protected
-         * @param  string $contenu
+         * @param  string $content
          */
         protected function _vueHTML($content)
         {
@@ -1856,7 +1856,7 @@ 
          * draw a curve (for border radius)
          *
          * @access protected
-         * @param  array $pt
+         * @param  double[] $pt
          * @param  array $color
          */
         protected function _drawCurve($pt, $color)
@@ -3237,7 +3237,7 @@ 
          * this is not a real TAG, it is just to write texts
          *
          * @param  array $param
-         * @return boolean
+         * @return null|boolean
          */
         protected function _tag_open_WRITE($param)
         {
@@ -4201,7 +4201,6 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @param  string $other
          * @return boolean
          */
         protected function _tag_open_CODE($param)
@@ -5079,7 +5078,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_COL($param)
         {
@@ -5696,7 +5695,6 @@ 
          * tag : SELECT
          * mode : CLOSE
          *
-         * @param  array $param
          * @return boolean
          */
         protected function _tag_close_SELECT()
@@ -5800,7 +5798,6 @@ 
          * tag : TEXTAREA
          * mode : CLOSE
          *
-         * @param  array $param
          * @return boolean
          */
         protected function _tag_close_TEXTAREA()
@@ -6110,7 +6107,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_LINE($param)
         {
@@ -6137,7 +6134,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_RECT($param)
         {
@@ -6164,7 +6161,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_CIRCLE($param)
         {
@@ -6189,7 +6186,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_ELLIPSE($param)
         {
@@ -6216,7 +6213,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_POLYLINE($param)
         {
@@ -6262,7 +6259,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_POLYGON($param)
         {
@@ -6309,7 +6306,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_PATH($param)
         {
@@ -6438,7 +6435,7 @@ 
          * mode : OPEN
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_open_G($param)
         {
@@ -6455,7 +6452,7 @@ 
          * mode : CLOSE
          *
          * @param  array $param
-         * @return boolean
+         * @return boolean|null
          */
         protected function _tag_close_G($param)
         {

Indentation +6464 added lines, -6465 removed lines

@@ -11,485 +11,484 @@ 
 
 if (!defined('__CLASS_HTML2PDF__')) {
 
-    define('__CLASS_HTML2PDF__', '4.03');
-    define('HTML2PDF_USED_TCPDF_VERSION', '5.0.002');
-
-    require_once(dirname(__FILE__).'/_class/exception.class.php');
-    require_once(dirname(__FILE__).'/_class/locale.class.php');
-    require_once(dirname(__FILE__).'/_class/myPdf.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingHtml.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingCss.class.php');
-
-    class HTML2PDF
-    {
-        /**
-         * HTML2PDF_myPdf object, extends from TCPDF
-         * @var HTML2PDF_myPdf
-         */
-        public $pdf = null;
-
-        /**
-         * CSS parsing
-         * @var HTML2PDF_parsingCss
-         */
-        public $parsingCss = null;
-
-        /**
-         * HTML parsing
-         * @var HTML2PDF_parsingHtml
-         */
-        public $parsingHtml = null;
-
-        protected $_langue           = 'fr';        // locale of the messages
-        protected $_orientation      = 'P';         // page orientation : Portrait ou Landscape
-        protected $_format           = 'A4';        // page format : A4, A3, ...
-        protected $_encoding         = '';          // charset encoding
-        protected $_unicode          = true;        // means that the input text is unicode (default = true)
-
-        protected $_testTdInOnepage  = true;        // test of TD that can not take more than one page
-        protected $_testIsImage      = true;        // test if the images exist or not
-        protected $_testIsDeprecated = false;       // test the deprecated functions
-
-        protected $_parsePos         = 0;           // position in the parsing
-        protected $_tempPos          = 0;           // temporary position for complex table
-        protected $_page             = 0;           // current page number
-
-        protected $_subHtml          = null;        // sub html
-        protected $_subPart          = false;       // sub HTML2PDF
-        protected $_subHEADER        = array();     // sub action to make the header
-        protected $_subFOOTER        = array();     // sub action to make the footer
-        protected $_subSTATES        = array();     // array to save some parameters
-
-        protected $_isSubPart        = false;       // flag : in a sub html2pdf
-        protected $_isInThead        = false;       // flag : in a thead
-        protected $_isInTfoot        = false;       // flag : in a tfoot
-        protected $_isInOverflow     = false;       // flag : in a overflow
-        protected $_isInFooter       = false;       // flag : in a footer
-        protected $_isInDraw         = null;        // flag : in a draw (svg)
-        protected $_isAfterFloat     = false;       // flag : is just after a float
-        protected $_isInForm         = false;       // flag : is in a float. false / action of the form
-        protected $_isInLink         = '';          // flag : is in a link. empty / href of the link
-        protected $_isInParagraph    = false;       // flag : is in a paragraph
-        protected $_isForOneLine     = false;       // flag : in a specific sub html2pdf to have the height of the next line
-
-        protected $_maxX             = 0;           // maximum X of the current zone
-        protected $_maxY             = 0;           // maximum Y of the current zone
-        protected $_maxE             = 0;           // number of elements in the current zone
-        protected $_maxH             = 0;           // maximum height of the line in the current zone
-        protected $_maxSave          = array();     // save the maximums of the current zone
-        protected $_currentH         = 0;           // height of the current line
-
-        protected $_defaultLeft      = 0;           // default marges of the page
-        protected $_defaultTop       = 0;
-        protected $_defaultRight     = 0;
-        protected $_defaultBottom    = 0;
-        protected $_defaultFont      = null;        // default font to use, is the asked font does not exist
-
-        protected $_margeLeft        = 0;           // current marges of the page
-        protected $_margeTop         = 0;
-        protected $_margeRight       = 0;
-        protected $_margeBottom      = 0;
-        protected $_marges           = array();     // save the different marges of the current page
-        protected $_pageMarges       = array();     // float marges of the current page
-        protected $_background       = array();     // background informations
-
-
-        protected $_firstPage        = true;        // flag : first page
-        protected $_defList          = array();     // table to save the stats of the tags UL and OL
-
-        protected $_lstAnchor        = array();     // list of the anchors
-        protected $_lstField         = array();     // list of the fields
-        protected $_lstSelect        = array();     // list of the options of the current select
-        protected $_previousCall     = null;        // last action called
-
-        protected $_debugActif       = false;       // flag : mode debug is active
-        protected $_debugOkUsage     = false;       // flag : the function memory_get_usage exist
-        protected $_debugOkPeak      = false;       // flag : the function memory_get_peak_usage exist
-        protected $_debugLevel       = 0;           // level in the debug
-        protected $_debugStartTime   = 0;           // debug start time
-        protected $_debugLastTime    = 0;           // debug stop time
-
-        static protected $_subobj    = null;        // object html2pdf prepared in order to accelerate the creation of sub html2pdf
-        static protected $_tables    = array();     // static table to prepare the nested html tables
-
-        /**
-         * class constructor
-         *
-         * @access public
-         * @param  string   $orientation page orientation, same as TCPDF
-         * @param  mixed    $format      The format used for pages, same as TCPDF
-         * @param  $tring   $langue      Langue : fr, en, it...
-         * @param  boolean  $unicode     TRUE means that the input text is unicode (default = true)
-         * @param  String   $encoding    charset encoding; default is UTF-8
-         * @param  array    $marges      Default marges (left, top, right, bottom)
-         * @return HTML2PDF $this
-         */
-        public function __construct($orientation = 'P', $format = 'A4', $langue='fr', $unicode=true, $encoding='UTF-8', $marges = array(5, 5, 5, 8))
-        {
-            // init the page number
-            $this->_page         = 0;
-            $this->_firstPage    = true;
-
-            // save the parameters
-            $this->_orientation  = $orientation;
-            $this->_format       = $format;
-            $this->_langue       = strtolower($langue);
-            $this->_unicode      = $unicode;
-            $this->_encoding     = $encoding;
-
-            // load the Local
-            HTML2PDF_locale::load($this->_langue);
-
-            // create the  HTML2PDF_myPdf object
-            $this->pdf = new HTML2PDF_myPdf($orientation, 'mm', $format, $unicode, $encoding);
-
-            // init the CSS parsing object
-            $this->parsingCss = new HTML2PDF_parsingCss($this->pdf);
-            $this->parsingCss->fontSet();
-            $this->_defList = array();
-
-            // init some tests
-            $this->setTestTdInOnePage(true);
-            $this->setTestIsImage(true);
-            $this->setTestIsDeprecated(true);
-
-            // init the default font
-            $this->setDefaultFont(null);
-
-            // init the HTML parsing object
-            $this->parsingHtml = new HTML2PDF_parsingHtml($this->_encoding);
-            $this->_subHtml = null;
-            $this->_subPart = false;
-
-            // init the marges of the page
-            if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);
-            $this->_setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
-            $this->_setMargins();
-            $this->_marges = array();
-
-            // init the form's fields
-            $this->_lstField = array();
-
-            return $this;
-        }
-
-        /**
-         * Destructor
-         *
-         * @access public
-         * @return null
-         */
-        public function __destruct()
-        {
-
-        }
-
-        /**
-         * Clone to create a sub HTML2PDF from HTML2PDF::$_subobj
-         *
-         * @access public
-         */
-        public function __clone()
-        {
-            $this->pdf = clone $this->pdf;
-            $this->parsingHtml = clone $this->parsingHtml;
-            $this->parsingCss = clone $this->parsingCss;
-            $this->parsingCss->setPdfParent($this->pdf);
-        }
-
-        /**
-         * set the debug mode to On
-         *
-         * @access public
-         * @return HTML2PDF $this
-         */
-        public function setModeDebug()
-        {
-            $time = microtime(true);
-
-            $this->_debugActif     = true;
-            $this->_debugOkUsage   = function_exists('memory_get_usage');
-            $this->_debugOkPeak    = function_exists('memory_get_peak_usage');
-            $this->_debugStartTime = $time;
-            $this->_debugLastTime  = $time;
-
-            $this->_DEBUG_stepline('step', 'time', 'delta', 'memory', 'peak');
-            $this->_DEBUG_add('Init debug');
-
-            return $this;
-        }
-
-        /**
-         * Set the test of TD thdat can not take more than one page
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestTdInOnePage($mode = true)
-        {
-            $this->_testTdInOnepage = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the test if the images exist or not
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestIsImage($mode = true)
-        {
-            $this->_testIsImage = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the test on deprecated functions
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestIsDeprecated($mode = true)
-        {
-            $this->_testIsDeprecated = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the default font to use, if no font is specify, or if the asked font does not exist
-         *
-         * @access public
-         * @param  string   $default name of the default font to use. If null : Arial is no font is specify, and error if the asked font does not exist
-         * @return HTML2PDF $this
-         */
-        public function setDefaultFont($default = null)
-        {
-            $this->_defaultFont = $default;
-            $this->parsingCss->setDefaultFont($default);
-
-            return $this;
-        }
-
-        /**
-         * add a font, see TCPDF function addFont
-         *
-         * @access public
-         * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-         * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-         * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-         * @return HTML2PDF $this
-         * @see TCPDF::addFont
-         */
-        public function addFont($family, $style='', $file='')
-        {
-            $this->pdf->AddFont($family, $style, $file);
-
-            return $this;
-        }
-
-        /**
-         * display a automatic index, from the bookmarks
-         *
-         * @access public
-         * @param  string  $titre         index title
-         * @param  int     $sizeTitle     font size of the index title, in mm
-         * @param  int     $sizeBookmark  font size of the index, in mm
-         * @param  boolean $bookmarkTitle add a bookmark for the index, at his beginning
-         * @param  boolean $displayPage   display the page numbers
-         * @param  int     $onPage        if null : at the end of the document on a new page, else on the $onPage page
-         * @param  string  $fontName      font name to use
-         * @return null
-         */
-        public function createIndex($titre = 'Index', $sizeTitle = 20, $sizeBookmark = 15, $bookmarkTitle = true, $displayPage = true, $onPage = null, $fontName = 'helvetica')
-        {
-            $oldPage = $this->_INDEX_NewPage($onPage);
-            $this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
-            if ($oldPage) $this->pdf->setPage($oldPage);
-        }
-
-        /**
-         * clean up the objects
-         *
-         * @access protected
-         */
-        protected function _cleanUp()
-        {
-            HTML2PDF::$_subobj = null;
-            HTML2PDF::$_tables = array();
-        }
-
-        /**
-         * Send the document to a given destination: string, local file or browser.
-         * Dest can be :
-         *  I : send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
-         *  D : send to the browser and force a file download with the name given by name.
-         *  F : save to a local server file with the name given by name.
-         *  S : return the document as a string. name is ignored.
-         *  FI: equivalent to F + I option
-         *  FD: equivalent to F + D option
-         *  true  => I
-         *  false => S
-         *
-         * @param  string $name The name of the file when saved.
-         * @param  string $dest Destination where to send the document.
-         * @return string content of the PDF, if $dest=S
-         * @see TCPDF::close
-         * @access public
-
-         */
-        public function Output($name = '', $dest = false)
-        {
-            // close the pdf and clean up
-            $this->_cleanUp();
-
-            // if on debug mode
-            if ($this->_debugActif) {
-                $this->_DEBUG_add('Before output');
-                $this->pdf->Close();
-                exit;
-            }
-
-            // complete parameters
-            if ($dest===false) $dest = 'I';
-            if ($dest===true)  $dest = 'S';
-            if ($dest==='')    $dest = 'I';
-            if ($name=='')     $name='document.pdf';
-
-            // clean up the destination
-            $dest = strtoupper($dest);
-            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
-
-            // the name must be a PDF name
-            if (strtolower(substr($name, -4))!='.pdf') {
-                throw new HTML2PDF_exception(0, 'The output document name "'.$name.'" is not a PDF name');
-            }
-
-            // call the output of TCPDF
-            return $this->pdf->Output($name, $dest);
-        }
-
-        /**
-         * convert HTML to PDF
-         *
-         * @access public
-         * @param  string   $html
-         * @param  boolean  $debugVue  enable the HTML debug vue
-         * @return null
-         */
-        public function writeHTML($html, $debugVue = false)
-        {
-            // if it is a real html page, we have to convert it
-            if (preg_match('/<body/isU', $html))
-                $html = $this->getHtmlFromPage($html);
-
-            $html = str_replace('[[date_y]]', date('Y'), $html);
-            $html = str_replace('[[date_m]]', date('m'), $html);
-            $html = str_replace('[[date_d]]', date('d'), $html);
-
-            $html = str_replace('[[date_h]]', date('H'), $html);
-            $html = str_replace('[[date_i]]', date('i'), $html);
-            $html = str_replace('[[date_s]]', date('s'), $html);
-
-            // If we are in HTML debug vue : display the HTML
-            if ($debugVue) {
-                return $this->_vueHTML($html);
-            }
-
-            // convert HTMl to PDF
-            $this->parsingCss->readStyle($html);
-            $this->parsingHtml->setHTML($html);
-            $this->parsingHtml->parse();
-            $this->_makeHTMLcode();
-        }
-
-        /**
-         * convert the HTML of a real page, to a code adapted to HTML2PDF
-         *
-         * @access public
-         * @param  string HTML of a real page
-         * @return string HTML adapted to HTML2PDF
-         */
-        public function getHtmlFromPage($html)
-        {
-            $html = str_replace('<BODY', '<body', $html);
-            $html = str_replace('</BODY', '</body', $html);
-
-            // extract the content
-            $res = explode('<body', $html);
-            if (count($res)<2) return $html;
-            $content = '<page'.$res[1];
-            $content = explode('</body', $content);
-            $content = $content[0].'</page>';
-
-            // extract the link tags
-            preg_match_all('/<link([^>]*)>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.'</link>'.$content;
-
-            // extract the css style tags
-            preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.$content;
-
-            return $content;
-        }
-
-        /**
-         * init a sub HTML2PDF. does not use it directly. Only the method createSubHTML must use it
-         *
-         * @access public
-         * @param  string  $format
-         * @param  string  $orientation
-         * @param  array   $marge
-         * @param  integer $page
-         * @param  array   $defLIST
-         * @param  integer $myLastPageGroup
-         * @param  integer $myLastPageGroupNb
-         */
-        public function initSubHtml($format, $orientation, $marge, $page, $defLIST, $myLastPageGroup, $myLastPageGroupNb)
-        {
-            $this->_isSubPart = true;
-
-            $this->parsingCss->setOnlyLeft();
-
-            $this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup!==null));
-
-            $this->_saveMargin(0, 0, $marge);
-            $this->_defList = $defLIST;
-
-            $this->_page = $page;
-            $this->pdf->setMyLastPageGroup($myLastPageGroup);
-            $this->pdf->setMyLastPageGroupNb($myLastPageGroupNb);
-            $this->pdf->setXY(0, 0);
-            $this->parsingCss->fontSet();
-        }
-
-        /**
-         * display the content in HTML moden for debug
-         *
-         * @access protected
-         * @param  string $contenu
-         */
-        protected function _vueHTML($content)
-        {
-            $content = preg_replace('/<page_header([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue01').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page_footer([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue02').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue03').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<\/page([^>]*)>/isU', '</div><hr>', $content);
-            $content = preg_replace('/<bookmark([^>]*)>/isU', '<hr>bookmark : $1<hr>', $content);
-            $content = preg_replace('/<\/bookmark([^>]*)>/isU', '', $content);
-            $content = preg_replace('/<barcode([^>]*)>/isU', '<hr>barcode : $1<hr>', $content);
-            $content = preg_replace('/<\/barcode([^>]*)>/isU', '', $content);
-            $content = preg_replace('/<qrcode([^>]*)>/isU', '<hr>qrcode : $1<hr>', $content);
-            $content = preg_replace('/<\/qrcode([^>]*)>/isU', '', $content);
-
-            echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+	define('__CLASS_HTML2PDF__', '4.03');
+	define('HTML2PDF_USED_TCPDF_VERSION', '5.0.002');
+
+	require_once(dirname(__FILE__).'/_class/exception.class.php');
+	require_once(dirname(__FILE__).'/_class/locale.class.php');
+	require_once(dirname(__FILE__).'/_class/myPdf.class.php');
+	require_once(dirname(__FILE__).'/_class/parsingHtml.class.php');
+	require_once(dirname(__FILE__).'/_class/parsingCss.class.php');
+
+	class HTML2PDF
+	{
+		/**
+		 * HTML2PDF_myPdf object, extends from TCPDF
+		 * @var HTML2PDF_myPdf
+		 */
+		public $pdf = null;
+
+		/**
+		 * CSS parsing
+		 * @var HTML2PDF_parsingCss
+		 */
+		public $parsingCss = null;
+
+		/**
+		 * HTML parsing
+		 * @var HTML2PDF_parsingHtml
+		 */
+		public $parsingHtml = null;
+
+		protected $_langue           = 'fr';        // locale of the messages
+		protected $_orientation      = 'P';         // page orientation : Portrait ou Landscape
+		protected $_format           = 'A4';        // page format : A4, A3, ...
+		protected $_encoding         = '';          // charset encoding
+		protected $_unicode          = true;        // means that the input text is unicode (default = true)
+
+		protected $_testTdInOnepage  = true;        // test of TD that can not take more than one page
+		protected $_testIsImage      = true;        // test if the images exist or not
+		protected $_testIsDeprecated = false;       // test the deprecated functions
+
+		protected $_parsePos         = 0;           // position in the parsing
+		protected $_tempPos          = 0;           // temporary position for complex table
+		protected $_page             = 0;           // current page number
+
+		protected $_subHtml          = null;        // sub html
+		protected $_subPart          = false;       // sub HTML2PDF
+		protected $_subHEADER        = array();     // sub action to make the header
+		protected $_subFOOTER        = array();     // sub action to make the footer
+		protected $_subSTATES        = array();     // array to save some parameters
+
+		protected $_isSubPart        = false;       // flag : in a sub html2pdf
+		protected $_isInThead        = false;       // flag : in a thead
+		protected $_isInTfoot        = false;       // flag : in a tfoot
+		protected $_isInOverflow     = false;       // flag : in a overflow
+		protected $_isInFooter       = false;       // flag : in a footer
+		protected $_isInDraw         = null;        // flag : in a draw (svg)
+		protected $_isAfterFloat     = false;       // flag : is just after a float
+		protected $_isInForm         = false;       // flag : is in a float. false / action of the form
+		protected $_isInLink         = '';          // flag : is in a link. empty / href of the link
+		protected $_isInParagraph    = false;       // flag : is in a paragraph
+		protected $_isForOneLine     = false;       // flag : in a specific sub html2pdf to have the height of the next line
+
+		protected $_maxX             = 0;           // maximum X of the current zone
+		protected $_maxY             = 0;           // maximum Y of the current zone
+		protected $_maxE             = 0;           // number of elements in the current zone
+		protected $_maxH             = 0;           // maximum height of the line in the current zone
+		protected $_maxSave          = array();     // save the maximums of the current zone
+		protected $_currentH         = 0;           // height of the current line
+
+		protected $_defaultLeft      = 0;           // default marges of the page
+		protected $_defaultTop       = 0;
+		protected $_defaultRight     = 0;
+		protected $_defaultBottom    = 0;
+		protected $_defaultFont      = null;        // default font to use, is the asked font does not exist
+
+		protected $_margeLeft        = 0;           // current marges of the page
+		protected $_margeTop         = 0;
+		protected $_margeRight       = 0;
+		protected $_margeBottom      = 0;
+		protected $_marges           = array();     // save the different marges of the current page
+		protected $_pageMarges       = array();     // float marges of the current page
+		protected $_background       = array();     // background informations
+
+
+		protected $_firstPage        = true;        // flag : first page
+		protected $_defList          = array();     // table to save the stats of the tags UL and OL
+
+		protected $_lstAnchor        = array();     // list of the anchors
+		protected $_lstField         = array();     // list of the fields
+		protected $_lstSelect        = array();     // list of the options of the current select
+		protected $_previousCall     = null;        // last action called
+
+		protected $_debugActif       = false;       // flag : mode debug is active
+		protected $_debugOkUsage     = false;       // flag : the function memory_get_usage exist
+		protected $_debugOkPeak      = false;       // flag : the function memory_get_peak_usage exist
+		protected $_debugLevel       = 0;           // level in the debug
+		protected $_debugStartTime   = 0;           // debug start time
+		protected $_debugLastTime    = 0;           // debug stop time
+
+		static protected $_subobj    = null;        // object html2pdf prepared in order to accelerate the creation of sub html2pdf
+		static protected $_tables    = array();     // static table to prepare the nested html tables
+
+		/**
+		 * class constructor
+		 *
+		 * @access public
+		 * @param  string   $orientation page orientation, same as TCPDF
+		 * @param  mixed    $format      The format used for pages, same as TCPDF
+		 * @param  $tring   $langue      Langue : fr, en, it...
+		 * @param  boolean  $unicode     TRUE means that the input text is unicode (default = true)
+		 * @param  String   $encoding    charset encoding; default is UTF-8
+		 * @param  array    $marges      Default marges (left, top, right, bottom)
+		 * @return HTML2PDF $this
+		 */
+		public function __construct($orientation = 'P', $format = 'A4', $langue='fr', $unicode=true, $encoding='UTF-8', $marges = array(5, 5, 5, 8))
+		{
+			// init the page number
+			$this->_page         = 0;
+			$this->_firstPage    = true;
+
+			// save the parameters
+			$this->_orientation  = $orientation;
+			$this->_format       = $format;
+			$this->_langue       = strtolower($langue);
+			$this->_unicode      = $unicode;
+			$this->_encoding     = $encoding;
+
+			// load the Local
+			HTML2PDF_locale::load($this->_langue);
+
+			// create the  HTML2PDF_myPdf object
+			$this->pdf = new HTML2PDF_myPdf($orientation, 'mm', $format, $unicode, $encoding);
+
+			// init the CSS parsing object
+			$this->parsingCss = new HTML2PDF_parsingCss($this->pdf);
+			$this->parsingCss->fontSet();
+			$this->_defList = array();
+
+			// init some tests
+			$this->setTestTdInOnePage(true);
+			$this->setTestIsImage(true);
+			$this->setTestIsDeprecated(true);
+
+			// init the default font
+			$this->setDefaultFont(null);
+
+			// init the HTML parsing object
+			$this->parsingHtml = new HTML2PDF_parsingHtml($this->_encoding);
+			$this->_subHtml = null;
+			$this->_subPart = false;
+
+			// init the marges of the page
+			if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);
+			$this->_setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
+			$this->_setMargins();
+			$this->_marges = array();
+
+			// init the form's fields
+			$this->_lstField = array();
+
+			return $this;
+		}
+
+		/**
+		 * Destructor
+		 *
+		 * @access public
+		 * @return null
+		 */
+		public function __destruct()
+		{
+
+		}
+
+		/**
+		 * Clone to create a sub HTML2PDF from HTML2PDF::$_subobj
+		 *
+		 * @access public
+		 */
+		public function __clone()
+		{
+			$this->pdf = clone $this->pdf;
+			$this->parsingHtml = clone $this->parsingHtml;
+			$this->parsingCss = clone $this->parsingCss;
+			$this->parsingCss->setPdfParent($this->pdf);
+		}
+
+		/**
+		 * set the debug mode to On
+		 *
+		 * @access public
+		 * @return HTML2PDF $this
+		 */
+		public function setModeDebug()
+		{
+			$time = microtime(true);
+
+			$this->_debugActif     = true;
+			$this->_debugOkUsage   = function_exists('memory_get_usage');
+			$this->_debugOkPeak    = function_exists('memory_get_peak_usage');
+			$this->_debugStartTime = $time;
+			$this->_debugLastTime  = $time;
+
+			$this->_DEBUG_stepline('step', 'time', 'delta', 'memory', 'peak');
+			$this->_DEBUG_add('Init debug');
+
+			return $this;
+		}
+
+		/**
+		 * Set the test of TD thdat can not take more than one page
+		 *
+		 * @access public
+		 * @param  boolean  $mode
+		 * @return HTML2PDF $this
+		 */
+		public function setTestTdInOnePage($mode = true)
+		{
+			$this->_testTdInOnepage = $mode ? true : false;
+
+			return $this;
+		}
+
+		/**
+		 * Set the test if the images exist or not
+		 *
+		 * @access public
+		 * @param  boolean  $mode
+		 * @return HTML2PDF $this
+		 */
+		public function setTestIsImage($mode = true)
+		{
+			$this->_testIsImage = $mode ? true : false;
+
+			return $this;
+		}
+
+		/**
+		 * Set the test on deprecated functions
+		 *
+		 * @access public
+		 * @param  boolean  $mode
+		 * @return HTML2PDF $this
+		 */
+		public function setTestIsDeprecated($mode = true)
+		{
+			$this->_testIsDeprecated = $mode ? true : false;
+
+			return $this;
+		}
+
+		/**
+		 * Set the default font to use, if no font is specify, or if the asked font does not exist
+		 *
+		 * @access public
+		 * @param  string   $default name of the default font to use. If null : Arial is no font is specify, and error if the asked font does not exist
+		 * @return HTML2PDF $this
+		 */
+		public function setDefaultFont($default = null)
+		{
+			$this->_defaultFont = $default;
+			$this->parsingCss->setDefaultFont($default);
+
+			return $this;
+		}
+
+		/**
+		 * add a font, see TCPDF function addFont
+		 *
+		 * @access public
+		 * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
+		 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
+		 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
+		 * @return HTML2PDF $this
+		 * @see TCPDF::addFont
+		 */
+		public function addFont($family, $style='', $file='')
+		{
+			$this->pdf->AddFont($family, $style, $file);
+
+			return $this;
+		}
+
+		/**
+		 * display a automatic index, from the bookmarks
+		 *
+		 * @access public
+		 * @param  string  $titre         index title
+		 * @param  int     $sizeTitle     font size of the index title, in mm
+		 * @param  int     $sizeBookmark  font size of the index, in mm
+		 * @param  boolean $bookmarkTitle add a bookmark for the index, at his beginning
+		 * @param  boolean $displayPage   display the page numbers
+		 * @param  int     $onPage        if null : at the end of the document on a new page, else on the $onPage page
+		 * @param  string  $fontName      font name to use
+		 * @return null
+		 */
+		public function createIndex($titre = 'Index', $sizeTitle = 20, $sizeBookmark = 15, $bookmarkTitle = true, $displayPage = true, $onPage = null, $fontName = 'helvetica')
+		{
+			$oldPage = $this->_INDEX_NewPage($onPage);
+			$this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
+			if ($oldPage) $this->pdf->setPage($oldPage);
+		}
+
+		/**
+		 * clean up the objects
+		 *
+		 * @access protected
+		 */
+		protected function _cleanUp()
+		{
+			HTML2PDF::$_subobj = null;
+			HTML2PDF::$_tables = array();
+		}
+
+		/**
+		 * Send the document to a given destination: string, local file or browser.
+		 * Dest can be :
+		 *  I : send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
+		 *  D : send to the browser and force a file download with the name given by name.
+		 *  F : save to a local server file with the name given by name.
+		 *  S : return the document as a string. name is ignored.
+		 *  FI: equivalent to F + I option
+		 *  FD: equivalent to F + D option
+		 *  true  => I
+		 *  false => S
+		 *
+		 * @param  string $name The name of the file when saved.
+		 * @param  string $dest Destination where to send the document.
+		 * @return string content of the PDF, if $dest=S
+		 * @see TCPDF::close
+		 * @access public
+		 */
+		public function Output($name = '', $dest = false)
+		{
+			// close the pdf and clean up
+			$this->_cleanUp();
+
+			// if on debug mode
+			if ($this->_debugActif) {
+				$this->_DEBUG_add('Before output');
+				$this->pdf->Close();
+				exit;
+			}
+
+			// complete parameters
+			if ($dest===false) $dest = 'I';
+			if ($dest===true)  $dest = 'S';
+			if ($dest==='')    $dest = 'I';
+			if ($name=='')     $name='document.pdf';
+
+			// clean up the destination
+			$dest = strtoupper($dest);
+			if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
+
+			// the name must be a PDF name
+			if (strtolower(substr($name, -4))!='.pdf') {
+				throw new HTML2PDF_exception(0, 'The output document name "'.$name.'" is not a PDF name');
+			}
+
+			// call the output of TCPDF
+			return $this->pdf->Output($name, $dest);
+		}
+
+		/**
+		 * convert HTML to PDF
+		 *
+		 * @access public
+		 * @param  string   $html
+		 * @param  boolean  $debugVue  enable the HTML debug vue
+		 * @return null
+		 */
+		public function writeHTML($html, $debugVue = false)
+		{
+			// if it is a real html page, we have to convert it
+			if (preg_match('/<body/isU', $html))
+				$html = $this->getHtmlFromPage($html);
+
+			$html = str_replace('[[date_y]]', date('Y'), $html);
+			$html = str_replace('[[date_m]]', date('m'), $html);
+			$html = str_replace('[[date_d]]', date('d'), $html);
+
+			$html = str_replace('[[date_h]]', date('H'), $html);
+			$html = str_replace('[[date_i]]', date('i'), $html);
+			$html = str_replace('[[date_s]]', date('s'), $html);
+
+			// If we are in HTML debug vue : display the HTML
+			if ($debugVue) {
+				return $this->_vueHTML($html);
+			}
+
+			// convert HTMl to PDF
+			$this->parsingCss->readStyle($html);
+			$this->parsingHtml->setHTML($html);
+			$this->parsingHtml->parse();
+			$this->_makeHTMLcode();
+		}
+
+		/**
+		 * convert the HTML of a real page, to a code adapted to HTML2PDF
+		 *
+		 * @access public
+		 * @param  string HTML of a real page
+		 * @return string HTML adapted to HTML2PDF
+		 */
+		public function getHtmlFromPage($html)
+		{
+			$html = str_replace('<BODY', '<body', $html);
+			$html = str_replace('</BODY', '</body', $html);
+
+			// extract the content
+			$res = explode('<body', $html);
+			if (count($res)<2) return $html;
+			$content = '<page'.$res[1];
+			$content = explode('</body', $content);
+			$content = $content[0].'</page>';
+
+			// extract the link tags
+			preg_match_all('/<link([^>]*)>/isU', $html, $match);
+			foreach ($match[0] as $src)
+				$content = $src.'</link>'.$content;
+
+			// extract the css style tags
+			preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
+			foreach ($match[0] as $src)
+				$content = $src.$content;
+
+			return $content;
+		}
+
+		/**
+		 * init a sub HTML2PDF. does not use it directly. Only the method createSubHTML must use it
+		 *
+		 * @access public
+		 * @param  string  $format
+		 * @param  string  $orientation
+		 * @param  array   $marge
+		 * @param  integer $page
+		 * @param  array   $defLIST
+		 * @param  integer $myLastPageGroup
+		 * @param  integer $myLastPageGroupNb
+		 */
+		public function initSubHtml($format, $orientation, $marge, $page, $defLIST, $myLastPageGroup, $myLastPageGroupNb)
+		{
+			$this->_isSubPart = true;
+
+			$this->parsingCss->setOnlyLeft();
+
+			$this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup!==null));
+
+			$this->_saveMargin(0, 0, $marge);
+			$this->_defList = $defLIST;
+
+			$this->_page = $page;
+			$this->pdf->setMyLastPageGroup($myLastPageGroup);
+			$this->pdf->setMyLastPageGroupNb($myLastPageGroupNb);
+			$this->pdf->setXY(0, 0);
+			$this->parsingCss->fontSet();
+		}
+
+		/**
+		 * display the content in HTML moden for debug
+		 *
+		 * @access protected
+		 * @param  string $contenu
+		 */
+		protected function _vueHTML($content)
+		{
+			$content = preg_replace('/<page_header([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue01').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<page_footer([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue02').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<page([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue03').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<\/page([^>]*)>/isU', '</div><hr>', $content);
+			$content = preg_replace('/<bookmark([^>]*)>/isU', '<hr>bookmark : $1<hr>', $content);
+			$content = preg_replace('/<\/bookmark([^>]*)>/isU', '', $content);
+			$content = preg_replace('/<barcode([^>]*)>/isU', '<hr>barcode : $1<hr>', $content);
+			$content = preg_replace('/<\/barcode([^>]*)>/isU', '', $content);
+			$content = preg_replace('/<qrcode([^>]*)>/isU', '<hr>qrcode : $1<hr>', $content);
+			$content = preg_replace('/<\/qrcode([^>]*)>/isU', '', $content);
+
+			echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
         <title>'.HTML2PDF_locale::get('vue04').' HTML</title>
@@ -499,5990 +498,5990 @@ 
 '.$content.'
     </body>
 </html>';
-            exit;
-        }
-
-        /**
-         * set the default margins of the page
-         *
-         * @access protected
-         * @param  int $left   (mm, left margin)
-         * @param  int $top    (mm, top margin)
-         * @param  int $right  (mm, right margin, if null => left=right)
-         * @param  int $bottom (mm, bottom margin, if null => bottom=8mm)
-         */
-        protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
-        {
-            if ($right===null)  $right = $left;
-            if ($bottom===null) $bottom = 8;
-
-            $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
-            $this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
-            $this->_defaultRight  = $this->parsingCss->ConvertToMM($right.'mm');
-            $this->_defaultBottom = $this->parsingCss->ConvertToMM($bottom.'mm');
-        }
-
-        /**
-         * create a new page
-         *
-         * @access protected
-         * @param  mixed   $format
-         * @param  string  $orientation
-         * @param  array   $background background information
-         * @param  integer $curr real position in the html parseur (if break line in the write of a text)
-         * @param  boolean $resetPageNumber
-         */
-        protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber=false)
-        {
-            $this->_firstPage = false;
-
-            $this->_format = $format ? $format : $this->_format;
-            $this->_orientation = $orientation ? $orientation : $this->_orientation;
-            $this->_background = $background!==null ? $background : $this->_background;
-            $this->_maxY = 0;
-            $this->_maxX = 0;
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-
-            $this->pdf->SetMargins($this->_defaultLeft, $this->_defaultTop, $this->_defaultRight);
-
-            if ($resetPageNumber) {
-                $this->pdf->startPageGroup();
-            }
-
-            $this->pdf->AddPage($this->_orientation, $this->_format);
-
-            if ($resetPageNumber) {
-                $this->pdf->myStartPageGroup();
-            }
-
-            $this->_page++;
-
-            if (!$this->_subPart && !$this->_isSubPart) {
-                if (is_array($this->_background)) {
-                    if (isset($this->_background['color']) && $this->_background['color']) {
-                        $this->pdf->setFillColorArray($this->_background['color']);
-                        $this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
-                    }
-
-                    if (isset($this->_background['img']) && $this->_background['img'])
-                        $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
-                }
-
-                $this->_setPageHeader();
-                $this->_setPageFooter();
-            }
-
-            $this->_setMargins();
-            $this->pdf->setY($this->_margeTop);
-
-            $this->_setNewPositionForNewLine($curr);
-            $this->_maxH = 0;
-        }
-
-        /**
-         * set the real margin, using the default margins and the page margins
-         *
-         * @access protected
-         */
-        protected function _setMargins()
-        {
-            // prepare the margins
-            $this->_margeLeft   = $this->_defaultLeft   + (isset($this->_background['left'])   ? $this->_background['left']   : 0);
-            $this->_margeRight  = $this->_defaultRight  + (isset($this->_background['right'])  ? $this->_background['right']  : 0);
-            $this->_margeTop    = $this->_defaultTop    + (isset($this->_background['top'])    ? $this->_background['top']    : 0);
-            $this->_margeBottom = $this->_defaultBottom + (isset($this->_background['bottom']) ? $this->_background['bottom'] : 0);
-
-            // set the PDF margins
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-
-            // set the float Margins
-            $this->_pageMarges = array();
-            if ($this->_isInParagraph!==false) {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_isInParagraph[0], $this->pdf->getW()-$this->_isInParagraph[1]);
-            } else {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_margeLeft, $this->pdf->getW()-$this->_margeRight);
-            }
-        }
-
-        /**
-         * add a debug step
-         *
-         * @access protected
-         * @param  string  $name step name
-         * @param  boolean $level (true=up, false=down, null=nothing to do)
-         * @return $this
-         */
-        protected function _DEBUG_add($name, $level=null)
-        {
-            // if true : UP
-            if ($level===true) $this->_debugLevel++;
-
-            $name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
-            $time  = microtime(true);
-            $usage = ($this->_debugOkUsage ? memory_get_usage() : 0);
-            $peak  = ($this->_debugOkPeak ? memory_get_peak_usage() : 0);
-
-            $this->_DEBUG_stepline(
-                $name,
-                number_format(($time - $this->_debugStartTime)*1000, 1, '.', ' ').' ms',
-                number_format(($time - $this->_debugLastTime)*1000, 1, '.', ' ').' ms',
-                number_format($usage/1024, 1, '.', ' ').' Ko',
-                number_format($peak/1024, 1, '.', ' ').' Ko'
-            );
-
-            $this->_debugLastTime = $time;
-
-            // it false : DOWN
-            if ($level===false) $this->_debugLevel--;
-
-            return $this;
-        }
-
-        /**
-         * display a debug line
-         *
-         *
-         * @access protected
-         * @param  string $name
-         * @param  string $timeTotal
-         * @param  string $timeStep
-         * @param  string $memoryUsage
-         * @param  string $memoryPeak
-         */
-        protected function _DEBUG_stepline($name, $timeTotal, $timeStep, $memoryUsage, $memoryPeak)
-        {
-            $txt = str_pad($name, 30, ' ', STR_PAD_RIGHT).
-                    str_pad($timeTotal, 12, ' ', STR_PAD_LEFT).
-                    str_pad($timeStep, 12, ' ', STR_PAD_LEFT).
-                    str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT).
-                    str_pad($memoryPeak, 15, ' ', STR_PAD_LEFT);
-
-            echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
-        }
-
-        /**
-         * get the Min and Max X, for Y (use the float margins)
-         *
-         * @access protected
-         * @param  float $y
-         * @return array(float, float)
-         */
-        protected function _getMargins($y)
-        {
-            $y = floor($y*100);
-            $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
-
-            foreach ($this->_pageMarges as $mY => $mX)
-                if ($mY<=$y) $x = $mX;
-
-            return $x;
-        }
-
-        /**
-         * Add margins, for a float
-         *
-         * @access protected
-         * @param  string $float (left / right)
-         * @param  float  $xLeft
-         * @param  float  $yTop
-         * @param  float  $xRight
-         * @param  float  $yBottom
-         */
-        protected function _addMargins($float, $xLeft, $yTop, $xRight, $yBottom)
-        {
-            // get the current float margins, for top and bottom
-            $oldTop    = $this->_getMargins($yTop);
-            $oldBottom = $this->_getMargins($yBottom);
-
-            // update the top float margin
-            if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
-            if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
-
-            $yTop = floor($yTop*100);
-            $yBottom = floor($yBottom*100);
-
-            // erase all the float margins that are smaller than the new one
-            foreach ($this->_pageMarges as $mY => $mX) {
-                if ($mY<$yTop) continue;
-                if ($mY>$yBottom) break;
-                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
-                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
-            }
-
-            // save the new Top and Bottom margins
-            $this->_pageMarges[$yTop] = $oldTop;
-            $this->_pageMarges[$yBottom] = $oldBottom;
-
-            // sort the margins
-            ksort($this->_pageMarges);
-
-            // we are just after float
-            $this->_isAfterFloat = true;
-        }
-
-        /**
-         * Save old margins (push), and set new ones
-         *
-         * @access protected
-         * @param  float  $ml left margin
-         * @param  float  $mt top margin
-         * @param  float  $mr right margin
-         */
-        protected function _saveMargin($ml, $mt, $mr)
-        {
-            // save old margins
-            $this->_marges[] = array('l' => $this->pdf->getlMargin(), 't' => $this->pdf->gettMargin(), 'r' => $this->pdf->getrMargin(), 'page' => $this->_pageMarges);
-
-            // set new ones
-            $this->pdf->SetMargins($ml, $mt, $mr);
-
-            // prepare for float margins
-            $this->_pageMarges = array();
-            $this->_pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
-        }
-
-        /**
-         * load the last saved margins (pop)
-         *
-         * @access protected
-         */
-        protected function _loadMargin()
-        {
-            $old = array_pop($this->_marges);
-            if ($old) {
-                $ml = $old['l'];
-                $mt = $old['t'];
-                $mr = $old['r'];
-                $mP = $old['page'];
-            } else {
-                $ml = $this->_margeLeft;
-                $mt = 0;
-                $mr = $this->_margeRight;
-                $mP = array($mt => array($ml, $this->pdf->getW()-$mr));
-            }
-
-            $this->pdf->SetMargins($ml, $mt, $mr);
-            $this->_pageMarges = $mP;
-        }
-
-        /**
-         * save the current maxs (push)
-         *
-         * @access protected
-         */
-        protected function _saveMax()
-        {
-            $this->_maxSave[] = array($this->_maxX, $this->_maxY, $this->_maxH, $this->_maxE);
-        }
-
-        /**
-         * load the last saved current maxs (pop)
-         *
-         * @access protected
-         */
-        protected function _loadMax()
-        {
-            $old = array_pop($this->_maxSave);
-
-            if ($old) {
-                $this->_maxX = $old[0];
-                $this->_maxY = $old[1];
-                $this->_maxH = $old[2];
-                $this->_maxE = $old[3];
-            } else {
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-        }
-
-        /**
-         * draw the PDF header with the HTML in page_header
-         *
-         * @access protected
-         */
-        protected function _setPageHeader()
-        {
-            if (!count($this->_subHEADER)) return false;
-
-            $oldParsePos = $this->_parsePos;
-            $oldParseCode = $this->parsingHtml->code;
-
-            $this->_parsePos = 0;
-            $this->parsingHtml->code = $this->_subHEADER;
-            $this->_makeHTMLcode();
-
-            $this->_parsePos = $oldParsePos;
-            $this->parsingHtml->code = $oldParseCode;
-        }
-
-        /**
-         * draw the PDF footer with the HTML in page_footer
-         *
-         * @access protected
-         */
-        protected function _setPageFooter()
-        {
-            if (!count($this->_subFOOTER)) return false;
-
-            $oldParsePos = $this->_parsePos;
-            $oldParseCode = $this->parsingHtml->code;
-
-            $this->_parsePos = 0;
-            $this->parsingHtml->code = $this->_subFOOTER;
-            $this->_isInFooter = true;
-            $this->_makeHTMLcode();
-            $this->_isInFooter = false;
-
-            $this->_parsePos = $oldParsePos;
-            $this->parsingHtml->code = $oldParseCode;
-        }
-
-        /**
-         * new line, with a specific height
-         *
-         * @access protected
-         * @param float   $h
-         * @param integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _setNewLine($h, $curr = null)
-        {
-            $this->pdf->Ln($h);
-            $this->_setNewPositionForNewLine($curr);
-        }
-
-        /**
-         * calculate the start position of the next line,  depending on the text-align
-         *
-         * @access protected
-         * @param  integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _setNewPositionForNewLine($curr = null)
-        {
-            // get the margins for the current line
-            list($lx, $rx) = $this->_getMargins($this->pdf->getY());
-            $this->pdf->setX($lx);
-            $wMax = $rx-$lx;
-            $this->_currentH = 0;
-
-            // if subPart => return because align left
-            if ($this->_subPart || $this->_isSubPart || $this->_isForOneLine) {
-                $this->pdf->setWordSpacing(0);
-                return null;
-            }
-
-            // create the sub object
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->_saveMargin(0, 0, $sub->pdf->getW()-$wMax);
-            $sub->_isForOneLine = true;
-            $sub->_parsePos = $this->_parsePos;
-            $sub->parsingHtml->code = $this->parsingHtml->code;
-
-            // if $curr => adapt the current position of the parsing
-            if ($curr!==null && $sub->parsingHtml->code[$this->_parsePos]['name']=='write') {
-                $txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
-                $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
-                $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
-            } else
-                $sub->_parsePos++;
-
-            // for each element of the parsing => load the action
-            $res = null;
-            for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
-                $action = $sub->parsingHtml->code[$sub->_parsePos];
-                $res = $sub->_executeAction($action);
-                if (!$res) break;
-            }
-
-            $w = $sub->_maxX; // max width
-            $h = $sub->_maxH; // max height
-            $e = ($res===null ? $sub->_maxE : 0); // maxnumber of elemets on the line
-
-            // destroy the sub HTML
-            $this->_destroySubHTML($sub);
-
-            // adapt the start of the line, depending on the text-align
-            if ($this->parsingCss->value['text-align']=='center')
-                $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-            else if ($this->parsingCss->value['text-align']=='right')
-                $this->pdf->setX($rx-$w-0.01);
-            else
-                $this->pdf->setX($lx);
-
-            // set the height of the line
-            $this->_currentH = $h;
-
-            // if justify => set the word spacing
-            if ($this->parsingCss->value['text-align']=='justify' && $e>1) {
-                $this->pdf->setWordSpacing(($wMax-$w)/($e-1));
-            } else {
-                $this->pdf->setWordSpacing(0);
-            }
-        }
-
-        /**
-         * prepare HTML2PDF::$_subobj (used for create the sub HTML2PDF objects
-         *
-         * @access protected
-         */
-        protected function _prepareSubObj()
-        {
-            $pdf = null;
-
-            // create the sub object
-            HTML2PDF::$_subobj = new HTML2PDF(
-                                        $this->_orientation,
-                                        $this->_format,
-                                        $this->_langue,
-                                        $this->_unicode,
-                                        $this->_encoding,
-                                        array($this->_defaultLeft,$this->_defaultTop,$this->_defaultRight,$this->_defaultBottom)
-                                    );
-
-            // init
-            HTML2PDF::$_subobj->setTestTdInOnePage($this->_testTdInOnepage);
-            HTML2PDF::$_subobj->setTestIsImage($this->_testIsImage);
-            HTML2PDF::$_subobj->setTestIsDeprecated($this->_testIsDeprecated);
-            HTML2PDF::$_subobj->setDefaultFont($this->_defaultFont);
-            HTML2PDF::$_subobj->parsingCss->css            = &$this->parsingCss->css;
-            HTML2PDF::$_subobj->parsingCss->cssKeys        = &$this->parsingCss->cssKeys;
-
-            // clone font from the original PDF
-            HTML2PDF::$_subobj->pdf->cloneFontFrom($this->pdf);
-
-            // remove the link to the parent
-            HTML2PDF::$_subobj->parsingCss->setPdfParent($pdf);
-        }
-
-        /**
-         * create a sub HTML2PDF, to calculate the multi-tables
-         *
-         * @access protected
-         * @param  &HTML2PDF $subHtml sub HTML2PDF to create
-         * @param  integer   $cellmargin if in a TD : cellmargin of this td
-         */
-        protected function _createSubHTML(&$subHtml, $cellmargin=0)
-        {
-            // prepare the subObject, if never prepare before
-            if (HTML2PDF::$_subobj===null) {
-                $this->_prepareSubObj();
-            }
-
-            // calculate the width to use
-            if ($this->parsingCss->value['width']) {
-                $marge = $cellmargin*2;
-                $marge+= $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
-                $marge+= $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
-                $marge = $this->pdf->getW() - $this->parsingCss->value['width'] + $marge;
-            } else {
-                $marge = $this->_margeLeft+$this->_margeRight;
-            }
-
-            // BUGFIX : we have to call the method, because of a bug in php 5.1.6
-            HTML2PDF::$_subobj->pdf->getPage();
-
-            // clone the sub oject
-            $subHtml = clone HTML2PDF::$_subobj;
-            $subHtml->parsingCss->table = $this->parsingCss->table;
-            $subHtml->parsingCss->value = $this->parsingCss->value;
-            $subHtml->initSubHtml(
-                $this->_format,
-                $this->_orientation,
-                $marge,
-                $this->_page,
-                $this->_defList,
-                $this->pdf->getMyLastPageGroup(),
-                $this->pdf->getMyLastPageGroupNb()
-            );
-        }
-
-        /**
-         * destroy a subHTML2PDF
-         *
-         * @access protected
-         */
-        protected function _destroySubHTML(&$subHtml)
-        {
-            unset($subHtml);
-            $subHtml = null;
-        }
-
-        /**
-         * Convert a arabic number in roman number
-         *
-         * @access protected
-         * @param  integer $nbArabic
-         * @return string  $nbRoman
-         */
-        protected function _listeArab2Rom($nbArabic)
-        {
-            $nbBaseTen    = array('I','X','C','M');
-            $nbBaseFive    = array('V','L','D');
-            $nbRoman    = '';
-
-            if ($nbArabic<1)    return $nbArabic;
-            if ($nbArabic>3999) return $nbArabic;
-
-            for ($i=3; $i>=0 ; $i--) {
-                $chiffre=floor($nbArabic/pow(10, $i));
-                if ($chiffre>=1) {
-                    $nbArabic=$nbArabic-$chiffre*pow(10, $i);
-                    if ($chiffre<=3) {
-                        for ($j=$chiffre; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
-                        }
-                    } else if ($chiffre==9) {
-                        $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseTen[$i+1];
-                    } else if ($chiffre==4) {
-                    $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseFive[$i];
-                    } else {
-                        $nbRoman=$nbRoman.$nbBaseFive[$i];
-                        for ($j=$chiffre-5; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
-                        }
-                    }
-                }
-            }
-            return $nbRoman;
-        }
-
-        /**
-         * add a LI to the current level
-         *
-         * @access protected
-         */
-        protected function _listeAddLi()
-        {
-            $this->_defList[count($this->_defList)-1]['nb']++;
-        }
-
-        /**
-         * get the width to use for the column of the list
-         *
-         * @access protected
-         * @return string $width
-         */
-        protected function _listeGetWidth()
-        {
-            return '7mm';
-        }
-
-        /**
-         * get the padding to use for the column of the list
-         *
-         * @access protected
-         * @return string $padding
-         */
-        protected function _listeGetPadding()
-        {
-            return '1mm';
-        }
-
-        /**
-         * get the information of the li on the current level
-         *
-         * @access protected
-         * @return array(fontName, small size, string)
-         */
-        protected function _listeGetLi()
-        {
-            $im = $this->_defList[count($this->_defList)-1]['img'];
-            $st = $this->_defList[count($this->_defList)-1]['style'];
-            $nb = $this->_defList[count($this->_defList)-1]['nb'];
-            $up = (substr($st, 0, 6)=='upper-');
-
-            if ($im) return array(false, false, $im);
-
-            switch($st)
-            {
-                case 'none':
-                    return array('helvetica', true, ' ');
-
-                case 'upper-alpha':
-                case 'lower-alpha':
-                    $str = '';
-                    while ($nb>26) {
-                        $str = chr(96+$nb%26).$str;
-                        $nb = floor($nb/26);
-                    }
-                    $str = chr(96+$nb).$str;
-
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-                case 'upper-roman':
-                case 'lower-roman':
-                    $str = $this->_listeArab2Rom($nb);
-
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-                case 'decimal':
-                    return array('helvetica', false, $nb.'.');
-
-                case 'square':
-                    return array('zapfdingbats', true, chr(110));
-
-                case 'circle':
-                    return array('zapfdingbats', true, chr(109));
-
-                case 'disc':
-                default:
-                    return array('zapfdingbats', true, chr(108));
-            }
-        }
-
-        /**
-         * add a level to the list
-         *
-         * @access protected
-         * @param  string $type  : ul, ol
-         * @param  string $style : lower-alpha, ...
-         * @param  string $img
-         */
-        protected function _listeAddLevel($type = 'ul', $style = '', $img = null)
-        {
-            // get the url of the image, if we want to use a image
-            if ($img) {
-                if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match)) {
-                    $img = $match[1];
-                } else {
-                    $img = null;
-                }
-            } else {
-                $img = null;
-            }
-
-            // prepare the datas
-            if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
-            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
-
-            if (!$style) {
-                if ($type=='ul')    $style = 'disc';
-                else                $style = 'decimal';
-            }
-
-            // add the new level
-            $this->_defList[count($this->_defList)] = array('style' => $style, 'nb' => 0, 'img' => $img);
-        }
-
-        /**
-         * remove a level to the list
-         *
-         * @access protected
-         */
-        protected function _listeDelLevel()
-        {
-            if (count($this->_defList)) {
-                unset($this->_defList[count($this->_defList)-1]);
-                $this->_defList = array_values($this->_defList);
-            }
-        }
-
-        /**
-         * execute the actions to convert the html
-         *
-         * @access protected
-         */
-        protected function _makeHTMLcode()
-        {
-            // foreach elements of the parsing
-            for ($this->_parsePos=0; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-
-                // get the action to do
-                $action = $this->parsingHtml->code[$this->_parsePos];
-
-                // if it is a opening of table / ul / ol
-                if (in_array($action['name'], array('table', 'ul', 'ol')) && !$action['close']) {
-
-                    //  we will work as a sub HTML to calculate the size of the element
-                    $this->_subPart = true;
-
-                    // get the name of the opening tag
-                    $tagOpen = $action['name'];
-
-                    // save the actual pos on the parsing
-                    $this->_tempPos = $this->_parsePos;
-
-                    // foreach elements, while we are in the opened tag
-                    while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]['name']==$tagOpen && $this->parsingHtml->code[$this->_tempPos]['close'])) {
-                        // make the action
-                        $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                        $this->_tempPos++;
-                    }
-
-                    // execute the closure of the tag
-                    if (isset($this->parsingHtml->code[$this->_tempPos])) {
-                        $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                    }
-
-                    // end of the sub part
-                    $this->_subPart = false;
-                }
-
-                // execute the action
-                $this->_executeAction($action);
-            }
-        }
-
-        /**
-         * execute the action from the parsing
-         *
-         * @access protected
-         * @param  array $action
-         */
-        protected function _executeAction($action)
-        {
-            // name of the action
-            $fnc = ($action['close'] ? '_tag_close_' : '_tag_open_').strtoupper($action['name']);
-
-            // parameters of the action
-            $param = $action['param'];
-
-            // if it the first action of the first page, and if it is not a open tag of PAGE => create the new page
-            if ($fnc!='_tag_open_PAGE' && $this->_firstPage) {
-                $this->_setNewPage();
-            }
-
-            // the action must exist
-            if (!is_callable(array(&$this, $fnc))) {
-                throw new HTML2PDF_exception(1, strtoupper($action['name']), $this->parsingHtml->getHtmlErrorCode($action['html_pos']));
-            }
-
-            // lauch the action
-            $res = $this->{$fnc}($param);
-
-            // save the name of the action
-            $this->_previousCall = $fnc;
-
-            // return the result
-            return $res;
-        }
-
-        /**
-         * get the position of the element on the current line, depending on his height
-         *
-         * @access protected
-         * @param  float $h
-         * @return float
-         */
-        protected function _getElementY($h)
-        {
-            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
-                return 0;
-
-            return ($this->_currentH-$h)*0.8;
-        }
-
-        /**
-         * make a break line
-         *
-         * @access protected
-         * @param  float $h current line height
-         * @param  integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _makeBreakLine($h, $curr = null)
-        {
-            if ($h) {
-                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
-                    $this->_setNewLine($h, $curr);
-                else
-                    $this->_setNewPage(null, '', null, $curr);
-            } else {
-                $this->_setNewPositionForNewLine($curr);
-            }
-
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-        }
-
-        /**
-         * display a image
-         *
-         * @access protected
-         * @param  string $src
-         * @param  boolean $subLi if true=image of a list
-         * @return boolean depending on "isForOneLine"
-         */
-        protected function _drawImage($src, $subLi=false)
-        {
-            // get the size of the image
-            // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-            $infos=@getimagesize($src);
-
-            // if the image does not exist, or can not be loaded
-            if (count($infos)<2) {
-                // if the test is activ => exception
-                if ($this->_testIsImage) {
-                    throw new HTML2PDF_exception(6, $src);
-                }
-
-                // else, display a gray rectangle
-                $src = null;
-                $infos = array(16, 16);
-            }
-
-            // convert the size of the image in the unit of the PDF
-            $imageWidth = $infos[0]/$this->pdf->getK();
-            $imageHeight = $infos[1]/$this->pdf->getK();
-
-            // calculate the size from the css style
-            if ($this->parsingCss->value['width'] && $this->parsingCss->value['height']) {
-                $w = $this->parsingCss->value['width'];
-                $h = $this->parsingCss->value['height'];
-            } else if ($this->parsingCss->value['width']) {
-                $w = $this->parsingCss->value['width'];
-                $h = $imageHeight*$w/$imageWidth;
-            } else if ($this->parsingCss->value['height']) {
-                $h = $this->parsingCss->value['height'];
-                $w = $imageWidth*$h/$imageHeight;
-            } else {
-                // convert px to pt
-                $w = 72./96.*$imageWidth;
-                $h = 72./96.*$imageHeight;
-            }
-
-            // are we in a float
-            $float = $this->parsingCss->getFloat();
-
-            // if we are in a float, but if something else if on the line => Break Line
-            if ($float && $this->_maxH) {
-                // make the break line (false if we are in "_isForOneLine" mode)
-                if (!$this->_tag_open_BR(array())) {
-                    return false;
-                }
-            }
-
-            // position of the image
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-
-            // if the image can not be put on the current line => new line
-            if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
-                if ($this->_isForOneLine) {
-                    return false;
-                }
-
-                // set the new line
-                $hnl = max($this->_maxH, $this->parsingCss->getLineHeight());
-                $this->_setNewLine($hnl);
-
-                // get the new position
-                $x = $this->pdf->getX();
-                $y = $this->pdf->getY();
-            }
-
-            // if the image can not be put on the current page
-            if (($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
-                // new page
-                $this->_setNewPage();
-
-                // get the new position
-                $x = $this->pdf->getX();
-                $y = $this->pdf->getY();
-            }
-
-            // correction for display the image of a list
-            $hT = 0.80*$this->parsingCss->value['font-size'];
-            if ($subLi && $h<$hT) {
-                $y+=($hT-$h);
-            }
-
-            // add the margin top
-            $yc = $y-$this->parsingCss->value['margin']['t'];
-
-            // get the width and the position of the parent
-            $old = $this->parsingCss->getOldValues();
-            if ( $old['width']) {
-                $parentWidth = $old['width'];
-                $parentX = $x;
-            } else {
-                $parentWidth = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                $parentX = $this->pdf->getlMargin();
-            }
-
-            // if we are in a gloat => adapt the parent position and width
-            if ($float) {
-                list($lx, $rx) = $this->_getMargins($yc);
-                $parentX = $lx;
-                $parentWidth = $rx-$lx;
-            }
-
-            // calculate the position of the image, if align to the right
-            if ($parentWidth>$w && $float!='left') {
-                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
-            }
-
-            // display the image
-            if (!$this->_subPart && !$this->_isSubPart) {
-                if ($src) {
-                    $this->pdf->Image($src, $x, $y, $w, $h, '', $this->_isInLink);
-                } else {
-                    // rectangle if the image can not be loaded
-                    $this->pdf->setFillColorArray(array(240, 220, 220));
-                    $this->pdf->Rect($x, $y, $w, $h, 'F');
-                }
-            }
-
-            // apply the margins
-            $x-= $this->parsingCss->value['margin']['l'];
-            $y-= $this->parsingCss->value['margin']['t'];
-            $w+= $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
-            $h+= $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
-
-            if ($float=='left') {
-                // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-
-                // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-                // get the new position
-                list($lx, $rx) = $this->_getMargins($yc);
-                $this->pdf->setXY($lx, $yc);
-            } else if ($float=='right') {
-                // save the current max. We don't save the X because it is not the real max of the line
-                $this->_maxY = max($this->_maxY, $y+$h);
-
-                // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-                // get the new position
-                list($lx, $rx) = $this->_getMargins($yc);
-                $this->pdf->setXY($lx, $yc);
-            } else {
-                // set the new position at the end of the image
-                $this->pdf->setX($x+$w);
-
-                // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-            }
-
-            return true;
-        }
-
-        /**
-         * draw a rectangle
-         *
-         * @access protected
-         * @param  float $x
-         * @param  float $y
-         * @param  float $w
-         * @param  float $h
-         * @param  array $border
-         * @param  float $padding - internal marge of the rectanble => not used, but...
-         * @param  float $margin  - external marge of the rectanble
-         * @param  array $background
-         * @return boolean
-         */
-        protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
-        {
-            // if we are in a subpart or if height is null => return false
-            if ($this->_subPart || $this->_isSubPart || $h===null) return false;
-
-            // add the margin
-            $x+= $margin;
-            $y+= $margin;
-            $w-= $margin*2;
-            $h-= $margin*2;
-
-            // get the radius of the border
-            $outTL = $border['radius']['tl'];
-            $outTR = $border['radius']['tr'];
-            $outBR = $border['radius']['br'];
-            $outBL = $border['radius']['bl'];
-
-            // prepare the out radius
-            $outTL = ($outTL[0] && $outTL[1]) ? $outTL : null;
-            $outTR = ($outTR[0] && $outTR[1]) ? $outTR : null;
-            $outBR = ($outBR[0] && $outBR[1]) ? $outBR : null;
-            $outBL = ($outBL[0] && $outBL[1]) ? $outBL : null;
-
-            // prepare the in radius
-            $inTL = $outTL;
-            $inTR = $outTR;
-            $inBR = $outBR;
-            $inBL = $outBL;
-
-            if (is_array($inTL)) {
-                $inTL[0]-= $border['l']['width'];
-                $inTL[1]-= $border['t']['width'];
-            }
-            if (is_array($inTR)) {
-                $inTR[0]-= $border['r']['width'];
-                $inTR[1]-= $border['t']['width'];
-            }
-            if (is_array($inBR)) {
-                $inBR[0]-= $border['r']['width'];
-                $inBR[1]-= $border['b']['width'];
-            }
-            if (is_array($inBL)) {
-                $inBL[0]-= $border['l']['width'];
-                $inBL[1]-= $border['b']['width'];
-            }
-
-            if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
-            if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
-            if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
-            if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
-
-            // prepare the background color
-            $pdfStyle = '';
-            if ($background['color']) {
-                $this->pdf->setFillColorArray($background['color']);
-                $pdfStyle.= 'F';
-            }
-
-            // if we have a background to fill => fill it with a path (because of the radius)
-            if ($pdfStyle) {
-                $this->pdf->clippingPathStart($x, $y, $w, $h, $outTL, $outTR, $outBL, $outBR);
-                $this->pdf->Rect($x, $y, $w, $h, $pdfStyle);
-                $this->pdf->clippingPathStop();
-            }
-
-            // prepare the background image
-            if ($background['image']) {
-                $iName      = $background['image'];
-                $iPosition  = $background['position']!==null ? $background['position'] : array(0, 0);
-                $iRepeat    = $background['repeat']!==null   ? $background['repeat']   : array(true, true);
-
-                // size of the background without the borders
-                $bX = $x;
-                $bY = $y;
-                $bW = $w;
-                $bH = $h;
-
-                if ($border['b']['width']) {
-                    $bH-= $border['b']['width'];
-                }
-                if ($border['l']['width']) {
-                    $bW-= $border['l']['width'];
-                    $bX+= $border['l']['width'];
-                }
-                if ($border['t']['width']) {
-                    $bH-= $border['t']['width'];
-                    $bY+= $border['t']['width'];
-                }
-                if ($border['r']['width']) {
-                    $bW-= $border['r']['width'];
-                }
-
-                // get the size of the image
-                // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                $imageInfos=@getimagesize($iName);
-
-                // if the image can not be loaded
-                if (count($imageInfos)<2) {
-                    if ($this->_testIsImage) {
-                        throw new HTML2PDF_exception(6, $iName);
-                    }
-                } else {
-                    // convert the size of the image from pixel to the unit of the PDF
-                    $imageWidth    = 72./96.*$imageInfos[0]/$this->pdf->getK();
-                    $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
-
-                    // prepare the position of the backgroung
-                    if ($iRepeat[0]) $iPosition[0] = $bX;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                    else $iPosition[0] = $bX+$iPosition[0];
-
-                    if ($iRepeat[1]) $iPosition[1] = $bY;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                    else $iPosition[1] = $bY+$iPosition[1];
-
-                    $imageXmin = $bX;
-                    $imageXmax = $bX+$bW;
-                    $imageYmin = $bY;
-                    $imageYmax = $bY+$bH;
-
-                    if (!$iRepeat[0] && !$iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
-                    } else if ($iRepeat[0] && !$iRepeat[1]) {
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
-                    } else if (!$iRepeat[0] && $iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
-                    }
-
-                    // build the path to display the image (because of radius)
-                    $this->pdf->clippingPathStart($bX, $bY, $bW, $bH, $inTL, $inTR, $inBL, $inBR);
-
-                    // repeat the image
-                    for ($iY=$imageYmin; $iY<$imageYmax; $iY+=$imageHeight) {
-                        for ($iX=$imageXmin; $iX<$imageXmax; $iX+=$imageWidth) {
-                            $cX = null;
-                            $cY = null;
-                            $cW = $imageWidth;
-                            $cH = $imageHeight;
-                            if ($imageYmax-$iY<$imageHeight) {
-                                $cX = $iX;
-                                $cY = $iY;
-                                $cH = $imageYmax-$iY;
-                            }
-                            if ($imageXmax-$iX<$imageWidth) {
-                                $cX = $iX;
-                                $cY = $iY;
-                                $cW = $imageXmax-$iX;
-                            }
-
-                            $this->pdf->Image($iName, $iX, $iY, $imageWidth, $imageHeight, '', '');
-                        }
-                    }
-
-                    // end of the path
-                    $this->pdf->clippingPathStop();
-                }
-            }
-
-            // adding some loose (0.01mm)
-            $loose = 0.01;
-            $x-= $loose;
-            $y-= $loose;
-            $w+= 2.*$loose;
-            $h+= 2.*$loose;
-            if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
-            if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
-            if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
-            if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
-
-            // prepare the test on borders
-            $testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
-            $testBt = ($border['t']['width'] && $border['t']['color'][0]!==null);
-            $testBr = ($border['r']['width'] && $border['r']['color'][0]!==null);
-            $testBb = ($border['b']['width'] && $border['b']['color'][0]!==null);
-
-            // draw the radius bottom-left
-            if (is_array($outBL) && ($testBb || $testBl)) {
-                if ($inBL) {
-                    $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
-                }
-                $this->_drawCurve($courbe, $border['l']['color']);
-            }
-
-            // draw the radius left-top
-            if (is_array($outTL) && ($testBt || $testBl)) {
-                if ($inTL) {
-                    $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
-                }
-                $this->_drawCurve($courbe, $border['t']['color']);
-            }
-
-            // draw the radius top-right
-            if (is_array($outTR) && ($testBt || $testBr)) {
-                if ($inTR) {
-                    $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
-                }
-                $this->_drawCurve($courbe, $border['r']['color']);
-            }
-
-            // draw the radius right-bottom
-            if (is_array($outBR) && ($testBb || $testBr)) {
-                if ($inBR) {
-                    $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
-                }
-                $this->_drawCurve($courbe, $border['b']['color']);
-            }
-
-            // draw the left border
-            if ($testBl) {
-                $pt = array();
-                $pt[] = $x;                       $pt[] = $y+$h;
-                $pt[] = $x;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x;                       $pt[] = $y;
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$h-$border['b']['width'];
-
-                $bord = 3;
-                if (is_array($outBL)) {
-                    $bord-=1;
-                    $pt[3] -= $outBL[1] - $border['b']['width'];
-                    if ($inBL) $pt[11]-= $inBL[1];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outTL)) {
-                    $bord-=2;
-                    $pt[5] += $outTL[1]-$border['t']['width'];
-                    if ($inTL) $pt[9] += $inTL[1];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
-            }
-
-            // draw the top border
-            if ($testBt) {
-                $pt = array();
-                $pt[] = $x;                          $pt[] = $y;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$border['t']['width'];
-
-                $bord = 3;
-                if (is_array($outTL)) {
-                    $bord-=1;
-                    $pt[2] += $outTL[0] - $border['l']['width'];
-                    if ($inTL) $pt[10]+= $inTL[0];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outTR)) {
-                    $bord-=2;
-                    $pt[4] -= $outTR[0] - $border['r']['width'];
-                    if ($inTR) $pt[8] -= $inTR[0];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
-            }
-
-            // draw the right border
-            if ($testBr) {
-                $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
-
-                $bord = 3;
-                if (is_array($outTR)) {
-                    $bord-=1;
-                    $pt[3] += $outTR[1] - $border['t']['width'];
-                    if ($inTR) $pt[11]+= $inTR[1];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outBR)) {
-                    $bord-=2;
-                    $pt[5] -= $outBR[1] - $border['b']['width'];
-                    if ($inBR) $pt[9] -= $inBR[1];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
-            }
-
-            // draw the bottom border
-            if ($testBb) {
-                $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h;
-                $pt[] = $x;                          $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
-
-                $bord = 3;
-                if (is_array($outBL)) {
-                    $bord-=2;
-                    $pt[4] += $outBL[0] - $border['l']['width'];
-                    if ($inBL) $pt[8] += $inBL[0];
-                    unset($pt[6]);unset($pt[7]);
-                }
-                if (is_array($outBR)) {
-                    $bord-=1;
-                    $pt[2] -= $outBR[0] - $border['r']['width'];
-                    if ($inBR) $pt[10]-= $inBR[0];
-                    unset($pt[0]);unset($pt[1]);
-
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
-            }
-
-            if ($background['color']) {
-                $this->pdf->setFillColorArray($background['color']);
-            }
-
-            return true;
-        }
-
-        /**
-         * draw a curve (for border radius)
-         *
-         * @access protected
-         * @param  array $pt
-         * @param  array $color
-         */
-        protected function _drawCurve($pt, $color)
-        {
-            $this->pdf->setFillColorArray($color);
-
-            if (count($pt)==10)
-                $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-            else
-                $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
-        }
-
-        /**
-         * draw a ligne with a specific type, and specific start and end for radius
-         *
-         * @access protected
-         * @param  array   $pt
-         * @param  float   $color
-         * @param  string  $type (dashed, dotted, double, solid)
-         * @param  float   $width
-         * @param  integer $radius (binary from 0 to 3 with 1=>start with a radius, 2=>end with a radius)
-         */
-        protected function _drawLine($pt, $color, $type, $width, $radius=3)
-        {
-            // set the fill color
-            $this->pdf->setFillColorArray($color);
-
-            // if dashed or dotted
-            if ($type=='dashed' || $type=='dotted') {
-
-                // clean the end of the line, if radius
-                if ($radius==1) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $pt = $tmp;
-                } else if ($radius==2) {
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $pt = $tmp;
-                } else if ($radius==3) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-                    $pt = $tmp;
-                }
-
-                // horisontal or vertical line
-                if ($pt[2]==$pt[0]) {
-                    $l = abs(($pt[3]-$pt[1])*0.5);
-                    $px = 0;
-                    $py = $width;
-                    $x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
-                    $x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
-                } else {
-                    $l = abs(($pt[2]-$pt[0])*0.5);
-                    $px = $width;
-                    $py = 0;
-                    $x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
-                    $x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
-                }
-
-                // if dashed : 3x bigger than dotted
-                if ($type=='dashed') {
-                    $px = $px*3.;
-                    $py = $py*3.;
-                }
-                $mode = ($l/($px+$py)<.5);
-
-                // display the dotted/dashed line
-                for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
-                    if (($i%2)==$mode) {
-                        $j = $i-0.5;
-                        $lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
-                        $ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
-                        $lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
-                        $ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
-
-                        $tmp = array();
-                        $tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
-                        $tmp[] = $x1+$lx2; $tmp[] = $y1+$ly2;
-                        $tmp[] = $x2+$lx2; $tmp[] = $y2+$ly2;
-                        $tmp[] = $x2+$lx1; $tmp[] = $y2+$ly1;
-                        $this->pdf->Polygon($tmp, 'F');
-
-                        if ($j>0) {
-                            $tmp = array();
-                            $tmp[] = $x1-$lx1; $tmp[] = $y1-$ly1;
-                            $tmp[] = $x1-$lx2; $tmp[] = $y1-$ly2;
-                            $tmp[] = $x2-$lx2; $tmp[] = $y2-$ly2;
-                            $tmp[] = $x2-$lx1; $tmp[] = $y2-$ly1;
-                            $this->pdf->Polygon($tmp, 'F');
-                        }
-                    }
-                }
-            } else if ($type=='double') {
-
-                // if double, 2 lines : 0=>1/3 and 2/3=>1
-                $pt1 = $pt;
-                $pt2 = $pt;
-
-                if (count($pt)==12) {
-                    // line 1
-                    $pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
-                    $pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
-                    $pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
-                    $pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
-                    $pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
-                    $pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
-                    $pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
-                    $pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
-                    $pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
-                    $pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
-
-                    // line 2
-                    $pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
-                    $pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
-                    $pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
-                    $pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
-                    $pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
-                } else {
-                    // line 1
-                    $pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
-                    $pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
-                    $pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
-                    $pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
-
-                    // line 2
-                    $pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
-                    $pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
-                    $pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
-                }
-                $this->pdf->Polygon($pt1, 'F');
-                $this->pdf->Polygon($pt2, 'F');
-            } else if ($type=='solid') {
-                // solid line : draw directly the polygon
-                $this->pdf->Polygon($pt, 'F');
-            }
-        }
-
-        /**
-         * prepare a transform matrix, only for drawing a SVG graphic
-         *
-         * @access protected
-         * @param  string $transform
-         * @return array  $matrix
-         */
-        protected function _prepareTransform($transform)
-        {
-            // it can not be  empty
-            if (!$transform) return null;
-
-            // sctions must be like scale(...)
-            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
-
-            // prepare the list of the actions
-            $actions = array();
-
-            // for actions
-            for ($k=0; $k<count($match[0]); $k++) {
-
-                // get the name of the action
-                $name = strtolower($match[1][$k]);
-
-                // get the parameters of the action
-                $val = explode(',', trim($match[2][$k]));
-                foreach ($val as $i => $j) {
-                    $val[$i] = trim($j);
-                }
-
-                // prepare the matrix, depending on the action
-                switch($name)
-                {
-                    case 'scale':
-                        if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
-                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
-                        $actions[] = array($val[0],0,0,$val[1],0,0);
-                        break;
-
-                    case 'translate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
-                        $actions[] = array(1,0,0,1,$val[0],$val[1]);
-                        break;
-
-                    case 'rotate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
-                        $actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
-                        break;
-
-                    case 'skewx':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,0,tan($val[0]),1,0,0);
-                        break;
-
-                    case 'skewy':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,tan($val[0]),0,1,0,0);
-                        break;
-                    case 'matrix':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
-                        if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
-                        if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
-                        $actions[] =$val;
-                        break;
-                }
-            }
-
-            // if ther is no actions => return
-            if (!$actions) return null;
-
-            // get the first matrix
-            $m = $actions[0]; unset($actions[0]);
-
-            // foreach matrix => multiply to the last matrix
-            foreach ($actions as $n) {
-                $m = array(
-                    $m[0]*$n[0]+$m[2]*$n[1],
-                    $m[1]*$n[0]+$m[3]*$n[1],
-                    $m[0]*$n[2]+$m[2]*$n[3],
-                    $m[1]*$n[2]+$m[3]*$n[3],
-                    $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-                    $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-                );
-            }
-
-            // return the matrix
-            return $m;
-        }
-
-        /**
-         * @access protected
-         * @param  &array $cases
-         * @param  &array $corr
-         */
-        protected function _calculateTableCellSize(&$cases, &$corr)
-        {
-            if (!isset($corr[0])) return true;
-
-            // for each cell without colspan, we get the max width for each column
-            $sw = array();
-            for ($x=0; $x<count($corr[0]); $x++) {
-                $m=0;
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1) {
-                        $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);
-                    }
-                }
-                $sw[$x] = $m;
-            }
-
-            // for each cell with colspan, we adapt the width of each column
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
-
-                        // sum the max width of each column in colspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
-
-                        // if the max width is < the width of the cell with colspan => we adapt the width of each max width
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            // set the new width, for each cell
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                        // without colspan
-                        if ($corr[$y][$x][2]==1) {
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
-                        // with colspan
-                        } else {
-                            $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $s+= $sw[$x+$i];
-                            }
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
-                        }
-                    }
-                }
-            }
-
-            // for each cell without rowspan, we get the max height for each line
-            $sh = array();
-            for ($y=0; $y<count($corr); $y++) {
-                $m=0;
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1) {
-                        $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
-                    }
-                }
-                $sh[$y] = $m;
-            }
-
-            // for each cell with rowspan, we adapt the height of each line
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
-
-                        // sum the max height of each line in rowspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
-
-                        // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            // set the new height, for each cell
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                        // without rowspan
-                        if ($corr[$y][$x][3]==1) {
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
-                        // with rowspan
-                        } else {
-                            $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $s+= $sh[$y+$i];
-                            }
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
-
-                            for ($j=1; $j<$corr[$y][$x][3]; $j++) {
-                                $tx = $x+1;
-                                $ty = $y+$j;
-                                for (true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
-                                if (isset($corr[$ty][$tx])) {
-                                    $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /**
-         * tag : PAGE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE($param)
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
-
-            $newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
-
-            $resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup']=='new');
-
-            $this->_maxH = 0;
-
-            // if new page set asked
-            if ($newPageSet) {
-                $this->_subHEADER = array();
-                $this->_subFOOTER = array();
-
-                // orientation
-                $orientation = '';
-                if (isset($param['orientation'])) {
-                    $param['orientation'] = strtolower($param['orientation']);
-                    if ($param['orientation']=='p')         $orientation = 'P';
-                    if ($param['orientation']=='portrait')  $orientation = 'P';
-
-                    if ($param['orientation']=='l')         $orientation = 'L';
-                    if ($param['orientation']=='paysage')   $orientation = 'L';
-                    if ($param['orientation']=='landscape') $orientation = 'L';
-                }
-
-                // format
-                $format = null;
-                if (isset($param['format'])) {
-                    $format = strtolower($param['format']);
-                    if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match)) {
-                        $format = array(intval($match[1]), intval($match[2]));
-                    }
-                }
-
-                // background
-                $background = array();
-                if (isset($param['backimg'])) {
-                    $background['img']    = isset($param['backimg'])  ? $param['backimg']  : '';       // src of the image
-                    $background['posX']   = isset($param['backimgx']) ? $param['backimgx'] : 'center'; // horizontale position of the image
-                    $background['posY']   = isset($param['backimgy']) ? $param['backimgy'] : 'middle'; // vertical position of the image
-                    $background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%';   // width of the image (100% = page width)
-
-                    // convert the src of the image, if parameters
-                    $background['img'] = str_replace('&amp;', '&', $background['img']);
-
-                    // convert the positions
-                    if ($background['posX']=='left')    $background['posX'] = '0%';
-                    if ($background['posX']=='center')  $background['posX'] = '50%';
-                    if ($background['posX']=='right')   $background['posX'] = '100%';
-                    if ($background['posY']=='top')     $background['posY'] = '0%';
-                    if ($background['posY']=='middle')  $background['posY'] = '50%';
-                    if ($background['posY']=='bottom')  $background['posY'] = '100%';
-
-                    if ($background['img']) {
-                        // get the size of the image
-                        // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                        $infos=@getimagesize($background['img']);
-                        if (count($infos)>1) {
-                            $imageWidth = $this->parsingCss->ConvertToMM($background['width'], $this->pdf->getW());
-                            $imageHeight = $imageWidth*$infos[1]/$infos[0];
-
-                            $background['width'] = $imageWidth;
-                            $background['posX']  = $this->parsingCss->ConvertToMM($background['posX'], $this->pdf->getW() - $imageWidth);
-                            $background['posY']  = $this->parsingCss->ConvertToMM($background['posY'], $this->pdf->getH() - $imageHeight);
-                        } else {
-                            $background = array();
-                        }
-                    } else {
-                        $background = array();
-                    }
-                }
-
-                // margins of the page
-                $background['top']    = isset($param['backtop'])    ? $param['backtop']    : '0';
-                $background['bottom'] = isset($param['backbottom']) ? $param['backbottom'] : '0';
-                $background['left']   = isset($param['backleft'])   ? $param['backleft']   : '0';
-                $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
-
-                // if no unit => mm
-                if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) $background['bottom'] .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['left']))   $background['left']   .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['right']))  $background['right']  .= 'mm';
-
-                // convert to mm
-                $background['top']    = $this->parsingCss->ConvertToMM($background['top'], $this->pdf->getH());
-                $background['bottom'] = $this->parsingCss->ConvertToMM($background['bottom'], $this->pdf->getH());
-                $background['left']   = $this->parsingCss->ConvertToMM($background['left'], $this->pdf->getW());
-                $background['right']  = $this->parsingCss->ConvertToMM($background['right'], $this->pdf->getW());
-
-                // get the background color
-                $res = false;
-                $background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
-                if (!$res) $background['color'] = null;
-
-                $this->parsingCss->save();
-                $this->parsingCss->analyse('PAGE', $param);
-                $this->parsingCss->setPosition();
-                $this->parsingCss->fontSet();
-
-                // new page
-                $this->_setNewPage($format, $orientation, $background, null, $resetPageNumber);
-
-                // automatic footer
-                if (isset($param['footer'])) {
-                    $lst = explode(';', $param['footer']);
-                    foreach ($lst as $key => $val) $lst[$key] = trim(strtolower($val));
-                    $page    = in_array('page', $lst);
-                    $date    = in_array('date', $lst);
-                    $hour    = in_array('heure', $lst);
-                    $form    = in_array('form', $lst);
-                } else {
-                    $page    = null;
-                    $date    = null;
-                    $hour    = null;
-                    $form    = null;
-                }
-                $this->pdf->SetMyFooter($page, $date, $hour, $form);
-            // else => we use the last page set used
-            } else {
-                $this->parsingCss->save();
-                $this->parsingCss->analyse('PAGE', $param);
-                $this->parsingCss->setPosition();
-                $this->parsingCss->fontSet();
-
-                $this->_setNewPage(null, null, null, null, $resetPageNumber);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE_HEADER
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_HEADER($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_subHEADER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-                $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_header') $action['name']='page_header_sub';
-                $this->_subHEADER[] = $action;
-                if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
-            }
-
-            $this->_setPageHeader();
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE_FOOTER
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_FOOTER($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_subFOOTER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-                $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_footer') $action['name']='page_footer_sub';
-                $this->_subFOOTER[] = $action;
-                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
-            }
-
-            $this->_setPageFooter();
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_HEADER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            // save the current stat
-            $this->_subSTATES = array();
-            $this->_subSTATES['x']  = $this->pdf->getX();
-            $this->_subSTATES['y']  = $this->pdf->getY();
-            $this->_subSTATES['s']  = $this->parsingCss->value;
-            $this->_subSTATES['t']  = $this->parsingCss->table;
-            $this->_subSTATES['ml'] = $this->_margeLeft;
-            $this->_subSTATES['mr'] = $this->_margeRight;
-            $this->_subSTATES['mt'] = $this->_margeTop;
-            $this->_subSTATES['mb'] = $this->_margeBottom;
-            $this->_subSTATES['mp'] = $this->_pageMarges;
-
-            // new stat for the header
-            $this->_pageMarges = array();
-            $this->_margeLeft    = $this->_defaultLeft;
-            $this->_margeRight   = $this->_defaultRight;
-            $this->_margeTop     = $this->_defaultTop;
-            $this->_margeBottom  = $this->_defaultBottom;
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
-
-            $this->parsingCss->initStyle();
-            $this->parsingCss->resetStyle();
-            $this->parsingCss->value['width'] = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-            $this->parsingCss->table = array();
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('page_header_sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE_HEADER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-
-            // restore the stat
-            $this->parsingCss->value = $this->_subSTATES['s'];
-            $this->parsingCss->table = $this->_subSTATES['t'];
-            $this->_pageMarges       = $this->_subSTATES['mp'];
-            $this->_margeLeft        = $this->_subSTATES['ml'];
-            $this->_margeRight       = $this->_subSTATES['mr'];
-            $this->_margeTop         = $this->_subSTATES['mt'];
-            $this->_margeBottom      = $this->_subSTATES['mb'];
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->setbMargin($this->_margeBottom);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-            $this->parsingCss->fontSet();
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_FOOTER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            // save the current stat
-            $this->_subSTATES = array();
-            $this->_subSTATES['x']    = $this->pdf->getX();
-            $this->_subSTATES['y']    = $this->pdf->getY();
-            $this->_subSTATES['s']    = $this->parsingCss->value;
-            $this->_subSTATES['t']    = $this->parsingCss->table;
-            $this->_subSTATES['ml']    = $this->_margeLeft;
-            $this->_subSTATES['mr']    = $this->_margeRight;
-            $this->_subSTATES['mt']    = $this->_margeTop;
-            $this->_subSTATES['mb']    = $this->_margeBottom;
-            $this->_subSTATES['mp']    = $this->_pageMarges;
-
-            // new stat for the footer
-            $this->_pageMarges  = array();
-            $this->_margeLeft   = $this->_defaultLeft;
-            $this->_margeRight  = $this->_defaultRight;
-            $this->_margeTop    = $this->_defaultTop;
-            $this->_margeBottom = $this->_defaultBottom;
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
-
-            $this->parsingCss->initStyle();
-            $this->parsingCss->resetStyle();
-            $this->parsingCss->value['width']    = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-            $this->parsingCss->table                = array();
-
-            // we create a sub HTML2PFDF, and we execute on it the content of the footer, to get the height of it
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-            $sub->_makeHTMLcode();
-            $this->pdf->setY($this->pdf->getH() - $sub->_maxY - $this->_defaultBottom - 0.01);
-            $this->_destroySubHTML($sub);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('page_footer_sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE_FOOTER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-
-            $this->parsingCss->value                = $this->_subSTATES['s'];
-            $this->parsingCss->table                = $this->_subSTATES['t'];
-            $this->_pageMarges                 = $this->_subSTATES['mp'];
-            $this->_margeLeft                = $this->_subSTATES['ml'];
-            $this->_margeRight                = $this->_subSTATES['mr'];
-            $this->_margeTop                    = $this->_subSTATES['mt'];
-            $this->_margeBottom                = $this->_subSTATES['mb'];
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-            $this->parsingCss->fontSet();
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : NOBREAK
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_NOBREAK($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // create a sub HTML2PDF to execute the content of the tag, to get the dimensions
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-            $sub->_makeHTMLcode();
-            $y = $this->pdf->getY();
-
-            // if the content does not fit on the page => new page
-            if (
-                $sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
-                $y + $sub->_maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
-            ) {
-                $this->_setNewPage();
-            }
-
-            // destroy the sub HTML2PDF
-            $this->_destroySubHTML($sub);
-
-            return true;
-        }
-
-
-        /**
-         * tag : NOBREAK
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_NOBREAK($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : DIV
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other name of tag that used the div tag
-         * @return boolean
-         */
-        protected function _tag_open_DIV($param, $other = 'div')
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), true);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->fontSet();
-
-            // for fieldset and legend
-            if (in_array($other, array('fieldset', 'legend'))) {
-                if (isset($param['moveTop']))  $this->parsingCss->value['margin']['t']    += $param['moveTop'];
-                if (isset($param['moveLeft'])) $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
-                if (isset($param['moveDown'])) $this->parsingCss->value['margin']['b']    += $param['moveDown'];
-            }
-
-            $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            // extract the content of the div
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-
-            // create a sub HTML2PDF to get the dimensions of the content of the div
-            $w = 0; $h = 0;
-            if (count($level)) {
-                $sub = null;
-                $this->_createSubHTML($sub);
-                $sub->parsingHtml->code = $level;
-                $sub->_makeHTMLcode();
-                $w = $sub->_maxX;
-                $h = $sub->_maxY;
-                $this->_destroySubHTML($sub);
-            }
-            $wReel = $w;
-            $hReel = $h;
-
-            $w+= $marge['l']+$marge['r']+0.001;
-            $h+= $marge['t']+$marge['b']+0.001;
-
-            if ($this->parsingCss->value['overflow']=='hidden') {
-                $overW = max($w, $this->parsingCss->value['width']);
-                $overH = max($h, $this->parsingCss->value['height']);
-                $overflow = true;
-                $this->parsingCss->value['old_maxX'] = $this->_maxX;
-                $this->parsingCss->value['old_maxY'] = $this->_maxY;
-                $this->parsingCss->value['old_maxH'] = $this->_maxH;
-                $this->parsingCss->value['old_overflow'] = $this->_isInOverflow;
-                $this->_isInOverflow = true;
-            } else {
-                $overW = null;
-                $overH = null;
-                $overflow = false;
-                $this->parsingCss->value['width']    = max($w, $this->parsingCss->value['width']);
-                $this->parsingCss->value['height']    = max($h, $this->parsingCss->value['height']);
-            }
-
-            switch($this->parsingCss->value['rotate'])
-            {
-                case 90:
-                    $tmp = $overH; $overH = $overW; $overW = $tmp;
-                    $tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
-                    unset($tmp);
-                    $w = $this->parsingCss->value['height'];
-                    $h = $this->parsingCss->value['width'];
-                    $tX =-$h;
-                    $tY = 0;
-                    break;
-
-                case 180:
-                    $w = $this->parsingCss->value['width'];
-                    $h = $this->parsingCss->value['height'];
-                    $tX = -$w;
-                    $tY = -$h;
-                    break;
-
-                case 270:
-                    $tmp = $overH; $overH = $overW; $overW = $tmp;
-                    $tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
-                    unset($tmp);
-                    $w = $this->parsingCss->value['height'];
-                    $h = $this->parsingCss->value['width'];
-                    $tX = 0;
-                    $tY =-$w;
-                    break;
-
-                default:
-                    $w = $this->parsingCss->value['width'];
-                    $h = $this->parsingCss->value['height'];
-                    $tX = 0;
-                    $tY = 0;
-                    break;
-            }
-
-            if (!$this->parsingCss->value['position']) {
-                if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
-
-                if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
-                        !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
-
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-            } else {
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-                $this->_saveMax();
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-
-            if ($this->parsingCss->value['rotate']) {
-                $this->pdf->startTransform();
-                $this->pdf->setRotation($this->parsingCss->value['rotate']);
-                $this->pdf->setTranslate($tX, $tY);
-            }
-
-            $this->_drawRectangle(
-                $this->parsingCss->value['x'],
-                $this->parsingCss->value['y'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height'],
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                0,
-                $this->parsingCss->value['background']
-            );
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-            $xCorr = 0;
-            $yCorr = 0;
-            if (!$this->_subPart && !$this->_isSubPart) {
-                switch($this->parsingCss->value['text-align'])
-                {
-                    case 'right':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel);
-                        break;
-                    case 'center':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
-                        break;
-                }
-                if ($xCorr>0) $xCorr=0;
-                switch($this->parsingCss->value['vertical-align'])
-                {
-                    case 'bottom':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel);
-                        break;
-                    case 'middle':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel)*0.5;
-                        break;
-                }
-            }
-
-            if ($overflow) {
-                $overW-= $marge['l']+$marge['r'];
-                $overH-= $marge['t']+$marge['b'];
-                $this->pdf->clippingPathStart(
-                    $this->parsingCss->value['x']+$marge['l'],
-                    $this->parsingCss->value['y']+$marge['t'],
-                    $this->parsingCss->value['width'],
-                    $this->parsingCss->value['height']
-                );
-
-                $this->parsingCss->value['x']+= $xCorr;
-
-                // marges from the dimension of the content
-                $mL = $this->parsingCss->value['x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $overW;
-            } else {
-                // marges from the dimension of the div
-                $mL = $this->parsingCss->value['x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-            }
-
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t']+$yCorr;
-            $this->_saveMargin($mL, 0, $mR);
-            $this->pdf->setXY($x, $y);
-
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : BLOCKQUOTE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BLOCKQUOTE($param)
-        {
-            return $this->_tag_open_DIV($param, 'blockquote');
-        }
-
-        /**
-         * tag : LEGEND
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LEGEND($param)
-        {
-            return $this->_tag_open_DIV($param, 'legend');
-        }
-
-        /**
-         * tag : FIELDSET
-         * mode : OPEN
-         *
-         * @author Pavel Kochman
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FIELDSET($param)
-        {
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('fieldset', $param);
-
-            // get height of LEGEND element and make fieldset corrections
-            for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
-                $action = $this->parsingHtml->code[$tempPos];
-                if ($action['name'] == 'fieldset') break;
-                if ($action['name'] == 'legend' && !$action['close']) {
-                    $legendOpenPos = $tempPos;
-
-                    $sub = null;
-                    $this->_createSubHTML($sub);
-                    $sub->parsingHtml->code = $this->parsingHtml->getLevel($tempPos - 1);
-
-                    $res = null;
-                    for ($sub->_parsePos = 0; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
-                        $action = $sub->parsingHtml->code[$sub->_parsePos];
-                        $sub->_executeAction($action);
-
-                        if ($action['name'] == 'legend' && $action['close'])
-                            break;
-                    }
-
-                    $legendH = $sub->_maxY;
-                    $this->_destroySubHTML($sub);
-
-                    $move = $this->parsingCss->value['padding']['t'] + $this->parsingCss->value['border']['t']['width'] + 0.03;
-
-                    $param['moveTop'] = $legendH / 2;
-
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveTop'] = - ($legendH / 2 + $move);
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveLeft'] = 2 - $this->parsingCss->value['border']['l']['width'] - $this->parsingCss->value['padding']['l'];
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveDown'] = $move;
-                    break;
-                }
-            }
-            $this->parsingCss->load();
-
-            return $this->_tag_open_DIV($param, 'fieldset');
-        }
-
-        /**
-         * tag : DIV
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @param  string $other name of tag that used the div tag
-         * @return boolean
-         */
-        protected function _tag_close_DIV($param, $other='div')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->parsingCss->value['overflow']=='hidden') {
-                $this->_maxX = $this->parsingCss->value['old_maxX'];
-                $this->_maxY = $this->parsingCss->value['old_maxY'];
-                $this->_maxH = $this->parsingCss->value['old_maxH'];
-                $this->_isInOverflow = $this->parsingCss->value['old_overflow'];
-                $this->pdf->clippingPathStop();
-            }
-
-            if ($this->parsingCss->value['rotate'])
-                $this->pdf->stopTransform();
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            $x = $this->parsingCss->value['x'];
-            $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r']+$this->parsingCss->value['margin']['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b']+$this->parsingCss->value['margin']['b'];
-
-            switch($this->parsingCss->value['rotate'])
-            {
-                case 90:
-                    $t = $w; $w = $h; $h = $t;
-                    break;
-
-                case 270:
-                    $t = $w; $w = $h; $h = $t;
-                    break;
-
-                default:
-                    break;
-            }
-
-
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
-
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-            } else {
-                $this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-                $this->_loadMax();
-            }
-
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_loadMargin();
-
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), false);
-
-            return true;
-        }
-
-        /**
-         * tag : BLOCKQUOTE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BLOCKQUOTE($param)
-        {
-            return $this->_tag_close_DIV($param, 'blockquote');
-        }
-
-        /**
-         * tag : FIELDSET
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FIELDSET($param)
-        {
-            return $this->_tag_close_DIV($param, 'fieldset');
-        }
-
-        /**
-         * tag : LEGEND
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LEGEND($param)
-        {
-            return $this->_tag_close_DIV($param, 'legend');
-        }
-
-        /**
-         * tag : BARCODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BARCODE($param)
-        {
-            // for  compatibility with old versions < 3.29
-            $lstBarcode = array();
-            $lstBarcode['UPC_A']  =    'UPCA';
-            $lstBarcode['CODE39'] =    'C39';
-
-            if (!isset($param['type']))     $param['type'] = 'C39';
-            if (!isset($param['value']))    $param['value']    = 0;
-            if (!isset($param['label']))    $param['label']    = 'label';
-            if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
-
-            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
-                throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
-
-            $param['type'] = strtoupper($param['type']);
-            if (isset($lstBarcode[$param['type']])) $param['type'] = $lstBarcode[$param['type']];
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('barcode', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
-            $h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
-            $txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
-            $c = $this->parsingCss->value['color'];
-            $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
-
-            $this->_maxX = max($this->_maxX, $x+$infos[0]);
-            $this->_maxY = max($this->_maxY, $y+$infos[1]);
-            $this->_maxH = max($this->_maxH, $infos[1]);
-            $this->_maxE++;
-
-            $this->pdf->setXY($x+$infos[0], $y);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : BARCODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BARCODE($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : QRCODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_QRCODE($param)
-        {
-            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
-                throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
-
-            if ($this->_debugActif) $this->_DEBUG_add('QRCODE');
-
-            if (!isset($param['value']))                     $param['value'] = '';
-            if (!isset($param['ec']))                        $param['ec'] = 'H';
-            if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
-            if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
-            if (isset($param['style']['border'])) {
-                $borders = $param['style']['border']!='none';
-                unset($param['style']['border']);
-            } else {
-                $borders = true;
-            }
-
-            if ($param['value']==='') return true;
-            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('qrcode', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];
-            $h = $this->parsingCss->value['height'];
-            $size = max($w, $h); if (!$size) $size = $this->parsingCss->ConvertToMM('50mm');
-
-            $style = array(
-                    'fgcolor' => $this->parsingCss->value['color'],
-                    'bgcolor' => $this->parsingCss->value['background']['color'],
-                );
-
-            if ($borders) {
-                $style['border'] = true;
-                $style['padding'] = 'auto';
-            } else {
-                $style['border'] = false;
-                $style['padding'] = 0;
-            }
-
-            if (!$this->_subPart && !$this->_isSubPart) {
-                $this->pdf->write2DBarcode($param['value'], 'QRCODE,'.$param['ec'], $x, $y, $size, $size, $style);
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$size);
-            $this->_maxY = max($this->_maxY, $y+$size);
-            $this->_maxH = max($this->_maxH, $size);
-            $this->_maxE++;
-
-            $this->pdf->setX($x+$size);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : QRCODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_QRCODE($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : BOOKMARK
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BOOKMARK($param)
-        {
-            $titre = isset($param['title']) ? trim($param['title']) : '';
-            $level = isset($param['level']) ? floor($param['level']) : 0;
-
-            if ($level<0) $level = 0;
-            if ($titre) $this->pdf->Bookmark($titre, $level, -1);
-
-            return true;
-        }
-
-        /**
-         * tag : BOOKMARK
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BOOKMARK($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * this is not a real TAG, it is just to write texts
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_WRITE($param)
-        {
-            $fill = ($this->parsingCss->value['background']['color']!==null && $this->parsingCss->value['background']['image']===null);
-            if (in_array($this->parsingCss->value['id_tag'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th'))) {
-                $fill = false;
-            }
-
-            // get the text to write
-            $txt = $param['txt'];
-
-            if ($this->_isAfterFloat) {
-                $txt = ltrim($txt);
-                $this->_isAfterFloat = false;
-            }
-
-            $txt = str_replace('[[page_nb]]', $this->pdf->getMyAliasNbPages(), $txt);
-            $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
-
-            if ($this->parsingCss->value['text-transform']!='none') {
-                if ($this->parsingCss->value['text-transform']=='capitalize')
-                    $txt = ucwords($txt);
-                else if ($this->parsingCss->value['text-transform']=='uppercase')
-                    $txt = strtoupper($txt);
-                else if ($this->parsingCss->value['text-transform']=='lowercase')
-                    $txt = strtolower($txt);
-            }
-
-            // size of the text
-            $h  = 1.08*$this->parsingCss->value['font-size'];
-            $dh = $h*$this->parsingCss->value['mini-decal'];
-            $lh = $this->parsingCss->getLineHeight();
-
-            // identify the align
-            $align = 'L';
-            if ($this->parsingCss->value['text-align']=='li_right') {
-                $w = $this->parsingCss->value['width'];
-                $align = 'R';
-            }
-
-            // calculate the width of each words, and of all the sentence
-            $w = 0;
-            $words = explode(' ', $txt);
-            foreach ($words as $k => $word) {
-                $words[$k] = array($word, $this->pdf->GetStringWidth($word));
-                $w+= $words[$k][1];
-            }
-            $space = $this->pdf->GetStringWidth(' ');
-            $w+= $space*(count($words)-1);
-
-            // position in the text
-            $currPos = 0;
-
-            // the bigger width of the text, after automatic break line
-            $maxX = 0;
-
-            // position of the text
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $dy = $this->_getElementY($lh);
-
-            // margins
-            list($left, $right) = $this->_getMargins($y);
-
-            // number of lines after automatic break line
-            $nb = 0;
-
-            // while we have words, and the text does not fit on the line => we cut the sentence
-            while ($x+$w>$right && $x<$right+$space && count($words)) {
-                // adding words 1 by 1 to fit on the line
-                $i=0;
-                $old = array('', 0);
-                $str = $words[0];
-                $add = false;
-                while (($x+$str[1])<$right) {
-                    $i++;
-                    $add = true;
-
-                    array_shift($words);
-                    $old = $str;
-
-                    if (!count($words)) break;
-                    $str[0].= ' '.$words[0][0];
-                    $str[1]+= $space+$words[0][1];
-                }
-                $str = $old;
-
-                // if  nothing fit on the line, and if the first word does not fit on the line => the word is too long, we put it
-                if ($i==0 && (($left+$words[0][1])>=$right)) {
-                    $str = $words[0];
-                    array_shift($words);
-                    $i++;
-                    $add = true;
-                }
-                $currPos+= ($currPos ? 1 : 0)+strlen($str[0]);
-
-                // write the extract sentence that fit on the page
-                $wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
-                if ($right - $left<$wc) $wc = $right - $left;
-
-                if (strlen($str[0])) {
-                    $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-                    $this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->_isInLink);
-                    $this->pdf->setXY($this->pdf->getX(), $y);
-                }
-                $this->_maxH = max($this->_maxH, $lh);
-
-                // max width
-                $maxX = max($maxX, $this->pdf->getX());
-
-                // new position and new width for the "while"
-                $w-= $str[1];
-                $y = $this->pdf->getY();
-                $x = $this->pdf->getX();
-                $dy = $this->_getElementY($lh);
-
-                // if we have again words to write
-                if (count($words)) {
-                    // remove the space at the end
-                    if ($add) $w-= $space;
-
-                    // if we don't add any word, and if the first word is empty => useless space to skip
-                    if (!$add && $words[0][0]==='') {
-                        array_shift($words);
-                    }
-
-                    // if it is just to calculate for one line => adding the number of words
-                    if ($this->_isForOneLine) {
-                        $this->_maxE+= $i;
-                        $this->_maxX = max($this->_maxX, $maxX);
-                        return null;
-                    }
-
-                    // automatic line break
-                    $this->_tag_open_BR(array('style' => ''), $currPos);
-
-                    // new position
-                    $y = $this->pdf->getY();
-                    $x = $this->pdf->getX();
-                    $dy = $this->_getElementY($lh);
-
-                    // if the next line does  not fit on the page => new page
-                    if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin()) {
-                        if (!$this->_isInOverflow && !$this->_isInFooter) {
-                            $this->_setNewPage(null, '', null, $currPos);
-                            $y = $this->pdf->getY();
-                            $x = $this->pdf->getX();
-                            $dy = $this->_getElementY($lh);
-                        }
-                    }
-
-                    // if more than 10000 line => error
-                    $nb++;
-                    if ($nb>10000) {
-                        $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                        throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
-                    }
-
-                    // new margins for the new line
-                    list($left, $right) = $this->_getMargins($y);
-                }
-            }
-
-            // if we have words after automatic cut, it is because they fit on the line => we write the text
-            if (count($words)) {
-                $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                $w+= $this->pdf->getWordSpacing()*(count($words));
-                $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-                $this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
-                $this->pdf->setXY($this->pdf->getX(), $y);
-                $this->_maxH = max($this->_maxH, $lh);
-                $this->_maxE+= count($words);
-            }
-
-            $maxX = max($maxX, $this->pdf->getX());
-            $maxY = $this->pdf->getY()+$h;
-
-            $this->_maxX = max($this->_maxX, $maxX);
-            $this->_maxY = max($this->_maxY, $maxY);
-
-            return true;
-        }
-
-        /**
-         * tag : BR
-         * mode : OPEN
-         *
-         * @param  array   $param
-         * @param  integer $curr real position in the html parseur (if break line in the write of a text)
-         * @return boolean
-         */
-        protected function _tag_open_BR($param, $curr = null)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-            if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
-
-            $this->_makeBreakLine($h, $curr);
-
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : HR
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_HR($param)
-        {
-            if ($this->_isForOneLine) return false;
-            $oldAlign = $this->parsingCss->value['text-align'];
-            $this->parsingCss->value['text-align'] = 'left';
-
-            if ($this->_maxH) $this->_tag_open_BR($param);
-
-            $fontSize = $this->parsingCss->value['font-size'];
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=0;
-
-            $param['style']['width'] = '100%';
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['height']=$this->parsingCss->ConvertToMM('1mm');
-
-            $this->parsingCss->analyse('hr', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $h = $this->parsingCss->value['height'];
-            if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-            if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-
-            $this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
-            $this->_maxH = $h;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_tag_open_BR($param);
-
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=$fontSize;
-
-            $this->parsingCss->value['text-align'] = $oldAlign;
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : B
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_B($param, $other = 'b')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : STRONG
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_STRONG($param)
-        {
-            return $this->_tag_open_B($param, 'strong');
-        }
-
-        /**
-         * tag : B
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_B($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : STRONG
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_STRONG($param)
-        {
-            return $this->_tag_close_B($param);
-        }
-
-        /**
-         * tag : I
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_I($param, $other = 'i')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-italic'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : ADDRESS
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_ADDRESS($param)
-        {
-            return $this->_tag_open_I($param, 'address');
-        }
-
-        /**
-         * tag : CITE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_CITE($param)
-        {
-            return $this->_tag_open_I($param, 'cite');
-        }
-
-        /**
-         * tag : EM
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_EM($param)
-        {
-            return $this->_tag_open_I($param, 'em');
-        }
-
-        /**
-         * tag : SAMP
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_SAMP($param)
-        {
-            return $this->_tag_open_I($param, 'samp');
-        }
-
-        /**
-         * tag : I
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_I($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : ADDRESS
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_ADDRESS($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : CITE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_CITE($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : EM
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_EM($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : SAMP
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SAMP($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : S
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_S($param, $other = 's')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-linethrough'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DEL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_DEL($param)
-        {
-            return $this->_tag_open_S($param, 'del');
-        }
-
-        /**
-         * tag : S
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_S($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DEL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_DEL($param)
-        {
-            return $this->_tag_close_S($param);
-        }
-
-        /**
-         * tag : U
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_U($param, $other='u')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-underline'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INS
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_INS($param)
-        {
-            return $this->_tag_open_U($param, 'ins');
-        }
-
-        /**
-         * tag : U
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_U($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INS
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_INS($param)
-        {
-            return $this->_tag_close_U($param);
-        }
-
-        /**
-         * tag : A
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_A($param)
-        {
-            $this->_isInLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
-
-            if (isset($param['name'])) {
-                $name =     $param['name'];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-
-                if (!$this->_lstAnchor[$name][1]) {
-                    $this->_lstAnchor[$name][1] = true;
-                    $this->pdf->SetLink($this->_lstAnchor[$name][0], -1, -1);
-                }
-            }
-
-            if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
-                $name = $match[1];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-
-                $this->_isInLink = $this->_lstAnchor[$name][0];
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-underline'] = true;
-            $this->parsingCss->value['color'] = array(20, 20, 250);
-            $this->parsingCss->analyse('a', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : A
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_A($param)
-        {
-            $this->_isInLink    = '';
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : H1
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_H1($param, $other = 'h1')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->_maxH) $this->_tag_open_BR(array());
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-
-            $size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
-            $this->parsingCss->value['margin']['l'] = 0;
-            $this->parsingCss->value['margin']['r'] = 0;
-            $this->parsingCss->value['margin']['t'] = $this->parsingCss->ConvertToMM('16px');
-            $this->parsingCss->value['margin']['b'] = $this->parsingCss->ConvertToMM('16px');
-            $this->parsingCss->value['font-size'] = $this->parsingCss->ConvertToMM($size[$other]);
-
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : H2
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H2($param)
-        {
-            return $this->_tag_open_H1($param, 'h2');
-        }
-
-        /**
-         * tag : H3
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H3($param)
-        {
-            return $this->_tag_open_H1($param, 'h3');
-        }
-
-        /**
-         * tag : H4
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H4($param)
-        {
-            return $this->_tag_open_H1($param, 'h4');
-        }
-
-        /**
-         * tag : H5
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H5($param)
-        {
-            return $this->_tag_open_H1($param, 'h5');
-        }
-
-        /**
-         * tag : H6
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H6($param)
-        {
-            return $this->_tag_open_H1($param, 'h6');
-        }
-
-        /**
-         * tag : H1
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H1($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH+= $this->parsingCss->value['margin']['b'];
-            $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_makeBreakLine($h);
-            $this->_maxH = 0;
-
-            $this->_maxY = max($this->_maxY, $this->pdf->getY());
-
-            return true;
-        }
-
-        /**
-         * tag : H2
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H2($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H3
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H3($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H4
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H4($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H5
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H5($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H6
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H6($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : SPAN
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_SPAN($param, $other = 'span')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FONT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FONT($param)
-        {
-            return $this->_tag_open_SPAN($param, 'font');
-        }
-
-        /**
-         * tag : LABEL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LABEL($param)
-        {
-            return $this->_tag_open_SPAN($param, 'label');
-        }
-
-        /**
-         * tag : SPAN
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SPAN($param)
-        {
-            $this->parsingCss->restorePosition();
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FONT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FONT($param)
-        {
-            return $this->_tag_close_SPAN($param);
-        }
-
-        /**
-         * tag : LABEL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LABEL($param)
-        {
-            return $this->_tag_close_SPAN($param);
-        }
-
-        /**
-         * tag : P
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_P($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('p', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-             // cancel the effects of the setPosition
-            $this->pdf->setXY($this->pdf->getX()-$this->parsingCss->value['margin']['l'], $this->pdf->getY()-$this->parsingCss->value['margin']['t']);
-
-            list($mL, $mR) = $this->_getMargins($this->pdf->getY());
-            $mR = $this->pdf->getW()-$mR;
-            $mL+= $this->parsingCss->value['margin']['l']+$this->parsingCss->value['padding']['l'];
-            $mR+= $this->parsingCss->value['margin']['r']+$this->parsingCss->value['padding']['r'];
-            $this->_saveMargin($mL, 0, $mR);
-
-            if ($this->parsingCss->value['text-indent']>0) {
-                $y = $this->pdf->getY()+$this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t'];
-                $this->_pageMarges[floor($y*100)] = array($mL+$this->parsingCss->value['text-indent'], $this->pdf->getW()-$mR);
-                $y+= $this->parsingCss->getLineHeight()*0.1;
-                $this->_pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
-            }
-            $this->_makeBreakLine($this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t']);
-            $this->_isInParagraph = array($mL, $mR);
-            return true;
-        }
-
-        /**
-         * tag : P
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_P($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->_maxH) $this->_tag_open_BR(array());
-            $this->_isInParagraph = false;
-            $this->_loadMargin();
-            $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_makeBreakLine($h);
-
-            return true;
-        }
-
-        /**
-         * tag : PRE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_PRE($param, $other = 'pre')
-        {
-            if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-family'] = 'courier';
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            if ($other=='pre') return $this->_tag_open_DIV($param, $other);
-
-            return true;
-        }
-
-        /**
-         * tag : CODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_CODE($param)
-        {
-            return $this->_tag_open_PRE($param, 'code');
-        }
-
-        /**
-         * tag : PRE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_close_PRE($param, $other = 'pre')
-        {
-            if ($other=='pre') {
-                if ($this->_isForOneLine) return false;
-
-                $this->_tag_close_DIV($param, $other);
-                $this->_tag_open_BR(array());
-            }
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : CODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_CODE($param)
-        {
-            return $this->_tag_close_PRE($param, 'code');
-        }
-
-        /**
-         * tag : BIG
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_BIG($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.12;
-            $this->parsingCss->value['mini-size'] *= 1.2;
-            $this->parsingCss->analyse('big', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : BIG
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_BIG($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SMALL
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SMALL($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.05;
-            $this->parsingCss->value['mini-size'] *= 0.82;
-            $this->parsingCss->analyse('small', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : SMALL
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SMALL($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUP
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SUP($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.15;
-            $this->parsingCss->value['mini-size'] *= 0.75;
-            $this->parsingCss->analyse('sup', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUP
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SUP($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUB
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SUB($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.15;
-            $this->parsingCss->value['mini-size'] *= 0.75;
-            $this->parsingCss->analyse('sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : SUB
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SUB($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : UL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_UL($param, $other = 'ul')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
-            }
-
-            if (!isset($param['style']['width'])) $param['allwidth'] = true;
-            $param['cellspacing'] = 0;
-
-            // a list is like a table
-            $this->_tag_open_TABLE($param, $other);
-
-            // add a level of list
-            $this->_listeAddLevel($other, $this->parsingCss->value['list-style-type'], $this->parsingCss->value['list-style-image']);
-
-            return true;
-        }
-
-        /**
-         * tag : OL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_OL($param)
-        {
-            return $this->_tag_open_UL($param, 'ol');
-        }
-
-        /**
-         * tag : UL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_UL($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TABLE($param);
-
-            $this->_listeDelLevel();
-
-            if (!$this->_subPart) {
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : OL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_OL($param)
-        {
-            return $this->_tag_close_UL($param);
-        }
-
-        /**
-         * tag : LI
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LI($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_listeAddLi();
-
-            if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
-
-            $paramPUCE = $param;
-
-            $inf = $this->_listeGetLi();
-            if ($inf[0]) {
-                $paramPUCE['style']['font-family']     = $inf[0];
-                $paramPUCE['style']['text-align']      = 'li_right';
-                $paramPUCE['style']['vertical-align']  = 'top';
-                $paramPUCE['style']['width']           = $this->_listeGetWidth();
-                $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-                $paramPUCE['txt'] = $inf[2];
-            } else {
-                $paramPUCE['style']['text-align']      = 'li_right';
-                $paramPUCE['style']['vertical-align']  = 'top';
-                $paramPUCE['style']['width']           = $this->_listeGetWidth();
-                $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-                $paramPUCE['src'] = $inf[2];
-                $paramPUCE['sub_li'] = true;
-            }
-
-            $this->_tag_open_TR($param, 'li');
-
-            $this->parsingCss->save();
-
-            // if small LI
-            if ($inf[1]) {
-                $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.045;
-                $this->parsingCss->value['mini-size'] *= 0.75;
-            }
-
-            // if we are in a sub html => prepare. Else : display
-            if ($this->_subPart) {
-                // TD for the puce
-                $tmpPos = $this->_tempPos;
-                $tmpLst1 = $this->parsingHtml->code[$tmpPos+1];
-                $tmpLst2 = $this->parsingHtml->code[$tmpPos+2];
-                $this->parsingHtml->code[$tmpPos+1] = array();
-                $this->parsingHtml->code[$tmpPos+1]['name']    = (isset($paramPUCE['src'])) ? 'img' : 'write';
-                $this->parsingHtml->code[$tmpPos+1]['param']    = $paramPUCE; unset($this->parsingHtml->code[$tmpPos+1]['param']['style']['width']);
-                $this->parsingHtml->code[$tmpPos+1]['close']    = 0;
-                $this->parsingHtml->code[$tmpPos+2] = array();
-                $this->parsingHtml->code[$tmpPos+2]['name']    = 'li';
-                $this->parsingHtml->code[$tmpPos+2]['param']    = $paramPUCE;
-                $this->parsingHtml->code[$tmpPos+2]['close']    = 1;
-                $this->_tag_open_TD($paramPUCE, 'li_sub');
-                $this->_tag_close_TD($param);
-                $this->_tempPos = $tmpPos;
-                $this->parsingHtml->code[$tmpPos+1] = $tmpLst1;
-                $this->parsingHtml->code[$tmpPos+2] = $tmpLst2;
-            } else {
-                // TD for the puce
-                $this->_tag_open_TD($paramPUCE, 'li_sub');
-                unset($paramPUCE['style']['width']);
-                if (isset($paramPUCE['src']))    $this->_tag_open_IMG($paramPUCE);
-                else                            $this->_tag_open_WRITE($paramPUCE);
-                $this->_tag_close_TD($paramPUCE);
-            }
-            $this->parsingCss->load();
-
-
-            // TD for the content
-            $this->_tag_open_TD($param, 'li');
-
-            return true;
-        }
-
-        /**
-         * tag : LI
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LI($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TD($param);
-
-            $this->_tag_close_TR($param);
-
-            return true;
-        }
-
-        /**
-         * tag : TBODY
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TBODY($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tbody', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : TBODY
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TBODY($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : THEAD
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_THEAD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('thead', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub part, save the number of the first TR in the thead
-            if ($this->_subPart) {
-                HTML2PDF::$_tables[$param['num']]['thead']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
-                    $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
-                    HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
-                    if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
-                }
-            } else {
-                $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['thead']['tr']);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : THEAD
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_THEAD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub HTM, construct the list of the TR in the thead
-            if ($this->_subPart) {
-                $min = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-                HTML2PDF::$_tables[$param['num']]['thead']['tr'] = range($min, $max);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TFOOT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TFOOT($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tfoot', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub part, save the number of the first TR in the tfoot
-            if ($this->_subPart) {
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
-                    $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
-                    HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
-                }
-            } else {
-                $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['tfoot']['tr']);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TFOOT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TFOOT($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub HTM, construct the list of the TR in the tfoot
-            if ($this->_subPart) {
-                $min = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr'] = range($min, $max);
-            }
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_THEAD_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('thead', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_THEAD_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_TFOOT_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tfoot', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TFOOT_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FORM
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FORM($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('form', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $this->pdf->setFormDefaultProp(
-                array(
-                    'lineWidth'=>1,
-                    'borderStyle'=>'solid',
-                    'fillColor'=>array(220, 220, 255),
-                    'strokeColor'=>array(128, 128, 200)
-                )
-            );
-
-            $this->_isInForm = isset($param['action']) ? $param['action'] : '';
-
-            return true;
-        }
-
-        /**
-         * tag : FORM
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FORM($param)
-        {
-            $this->_isInForm = false;
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : TABLE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TABLE($param, $other = 'table')
-        {
-            if ($this->_maxH) {
-                if ($this->_isForOneLine) return false;
-                $this->_tag_open_BR(array());
-            }
-
-            if ($this->_isForOneLine) {
-                $this->_maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                return false;
-            }
-
-            $this->_maxH = 0;
-
-            $alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
-            if (isset($param['align'])) unset($param['align']);
-            if (!in_array($alignObject, array('left', 'center', 'right'))) $alignObject = 'left';
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            // collapse table ?
-            $collapse = false;
-            if ($other=='table') {
-                $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-            }
-
-            // if collapse => no borders for the table, only for TD
-            if ($collapse) {
-                $param['style']['border'] = 'none';
-                $param['cellspacing'] = 0;
-                $none = $this->parsingCss->readBorder('none');
-                $this->parsingCss->value['border']['t'] = $none;
-                $this->parsingCss->value['border']['r'] = $none;
-                $this->parsingCss->value['border']['b'] = $none;
-                $this->parsingCss->value['border']['l'] = $none;
-            }
-
-            // if we are in a SUB html => prepare the properties of the table
-            if ($this->_subPart) {
-                if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
-                HTML2PDF::$_tables[$param['num']] = array();
-                HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
-                HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
-                HTML2PDF::$_tables[$param['num']]['cellspacing']     = $this->parsingCss->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                HTML2PDF::$_tables[$param['num']]['cases']           = array();          // properties of each TR/TD
-                HTML2PDF::$_tables[$param['num']]['corr']            = array();          // link between TR/TD and colspan/rowspan
-                HTML2PDF::$_tables[$param['num']]['corr_x']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['corr_y']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['td_curr']         = 0;                // current column
-                HTML2PDF::$_tables[$param['num']]['tr_curr']         = 0;                // current row
-                HTML2PDF::$_tables[$param['num']]['curr_x']          = $this->pdf->getX();
-                HTML2PDF::$_tables[$param['num']]['curr_y']          = $this->pdf->getY();
-                HTML2PDF::$_tables[$param['num']]['width']           = 0;                // global width
-                HTML2PDF::$_tables[$param['num']]['height']          = 0;                // global height
-                HTML2PDF::$_tables[$param['num']]['align']           = $alignObject;
-                HTML2PDF::$_tables[$param['num']]['marge']           = array();
-                HTML2PDF::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t']+$this->parsingCss->value['border']['t']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r']+$this->parsingCss->value['border']['r']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b']+$this->parsingCss->value['border']['b']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l']+$this->parsingCss->value['border']['l']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['page']            = 0;                // number of pages
-                HTML2PDF::$_tables[$param['num']]['new_page']        = true;             // flag : new page for the current TR
-                HTML2PDF::$_tables[$param['num']]['style_value']     = null;             // CSS style of the table
-                HTML2PDF::$_tables[$param['num']]['thead']           = array();          // properties on the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']           = array();          // properties on the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['tr']     = array();          // list of the TRs in the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr']     = array();          // list of the TRs in the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['height']    = 0;             // thead height
-                HTML2PDF::$_tables[$param['num']]['tfoot']['height']    = 0;             // tfoot height
-                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();            // HTML content of the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();            // HTML content of the tfoot
-                HTML2PDF::$_tables[$param['num']]['cols']        = array();              // properties of the COLs
-
-                $this->_saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
-
-                $this->parsingCss->value['width']-= HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
-            } else {
-                // we start from the first page and the first page of the table
-                HTML2PDF::$_tables[$param['num']]['page'] = 0;
-                HTML2PDF::$_tables[$param['num']]['td_curr']    = 0;
-                HTML2PDF::$_tables[$param['num']]['tr_curr']    = 0;
-                HTML2PDF::$_tables[$param['num']]['td_x']        = HTML2PDF::$_tables[$param['num']]['marge']['l']+HTML2PDF::$_tables[$param['num']]['curr_x'];
-                HTML2PDF::$_tables[$param['num']]['td_y']        = HTML2PDF::$_tables[$param['num']]['marge']['t']+HTML2PDF::$_tables[$param['num']]['curr_y'];
-
-                // draw the borders/background of the first page/part of the table
-                $this->_drawRectangle(
-                    HTML2PDF::$_tables[$param['num']]['curr_x'],
-                    HTML2PDF::$_tables[$param['num']]['curr_y'],
-                    HTML2PDF::$_tables[$param['num']]['width'],
-                    isset(HTML2PDF::$_tables[$param['num']]['height'][0]) ? HTML2PDF::$_tables[$param['num']]['height'][0] : null,
-                    $this->parsingCss->value['border'],
-                    $this->parsingCss->value['padding'],
-                    0,
-                    $this->parsingCss->value['background']
-                );
-
-                HTML2PDF::$_tables[$param['num']]['style_value'] = $this->parsingCss->value;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TABLE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TABLE($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-                // calculate the size of each case
-                $this->_calculateTableCellSize(HTML2PDF::$_tables[$param['num']]['cases'], HTML2PDF::$_tables[$param['num']]['corr']);
-
-                // calculate the height of the thead and the tfoot
-                $lst = array('thead', 'tfoot');
-                foreach ($lst as $mode) {
-                    HTML2PDF::$_tables[$param['num']][$mode]['height'] = 0;
-                    foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
-                        // hauteur de la ligne tr
-                        $h = 0;
-                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
-                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
-                                $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
-                        HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
-                    }
-                }
-
-                // calculate the width of the table
-                HTML2PDF::$_tables[$param['num']]['width'] = HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
-                if (isset(HTML2PDF::$_tables[$param['num']]['cases'][0])) {
-                    foreach (HTML2PDF::$_tables[$param['num']]['cases'][0] as $case) {
-                        HTML2PDF::$_tables[$param['num']]['width']+= $case['w'];
-                    }
-                }
-
-                // X position of the table
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                $x = HTML2PDF::$_tables[$param['num']]['curr_x'];
-                $w = HTML2PDF::$_tables[$param['num']]['width'];
-                if ($parentWidth>$w) {
-                    if (HTML2PDF::$_tables[$param['num']]['align']=='center')
-                        $x = $x + ($parentWidth-$w)*0.5;
-                    else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
-                        $x = $x + $parentWidth-$w;
-
-                    HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
-                }
-
-                // calculate the height of the table
-                HTML2PDF::$_tables[$param['num']]['height'] = array();
-
-                // minimum of the height because of margins, and of the thead and tfoot height
-                $h0 = HTML2PDF::$_tables[$param['num']]['marge']['t'] + HTML2PDF::$_tables[$param['num']]['marge']['b'];
-                $h0+= HTML2PDF::$_tables[$param['num']]['thead']['height'] + HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
-
-                // max height of the page
-                $max = $this->pdf->getH() - $this->pdf->getbMargin();
-
-                // current position on the page
-                $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
-                $height = $h0;
-
-                // we get the height of each line
-                for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
-
-                    // if it is a TR of the thead or of the tfoot => skip
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) continue;
-
-                    // height of the line
-                    $th = 0;
-                    $h = 0;
-                    for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
-                        $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
-
-                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
-                            $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
-                    }
-
-                    // if the row does not fit on the page => new page
-                    if ($y+$h+$height>$max) {
-                        if ($height==$h0) $height = null;
-                        HTML2PDF::$_tables[$param['num']]['height'][] = $height;
-                        $height = $h0;
-                        $y = $this->_margeTop;
-                    }
-                    $height+= $th;
-                }
-
-                // if ther is a height at the end, add it
-                if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
-            } else {
-                // if we have tfoor, draw it
-                if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
-                    $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                    $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                    $oldParsePos = $this->_parsePos;
-                    $oldParseCode = $this->parsingHtml->code;
-
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                    $this->_parsePos = 0;
-                    $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
-                    $this->_isInTfoot = true;
-                    $this->_makeHTMLcode();
-                    $this->_isInTfoot = false;
-
-                    $this->_parsePos =     $oldParsePos;
-                    $this->parsingHtml->code = $oldParseCode;
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                }
-
-                // get the positions of the end of the table
-                $x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
-                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
-                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
-
-                $this->_maxX = max($this->_maxX, $x);
-                $this->_maxY = max($this->_maxY, $y);
-
-                $this->pdf->setXY($this->pdf->getlMargin(), $y);
-
-                $this->_loadMargin();
-
-                if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
-            }
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-
-            return true;
-        }
-
-        /**
-         * tag : COL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_COL($param)
-        {
-            $span = isset($param['span']) ? $param['span'] : 1;
-            for ($k=0; $k<$span; $k++)
-                HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
-        }
-
-        /**
-         * tag : COL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_COL($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : TR
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TR($param, $other = 'tr')
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // position in the table
-            HTML2PDF::$_tables[$param['num']]['tr_curr']++;
-            HTML2PDF::$_tables[$param['num']]['td_curr']= 0;
-
-            // if we are not in a sub html
-            if (!$this->_subPart) {
-
-                // Y after the row
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    $ty = max($ty, HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h']);
-                }
-
-                // height of the tfoot
-                $hfoot = HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
-
-                // if the line does not fit on the page => new page
-                if (!$this->_isInTfoot && HTML2PDF::$_tables[$param['num']]['td_y'] + HTML2PDF::$_tables[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin()) {
-
-                    // fi ther is a tfoot => draw it
-                    if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
-                        $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                        $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                        $oldParsePos = $this->_parsePos;
-                        $oldParseCode = $this->parsingHtml->code;
-
-                        HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                        HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                        $this->_parsePos = 0;
-                        $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
-                        $this->_isInTfoot = true;
-                        $this->_makeHTMLcode();
-                        $this->_isInTfoot = false;
-
-                        $this->_parsePos =     $oldParsePos;
-                        $this->parsingHtml->code = $oldParseCode;
-                        HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                        HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                    }
-
-                    // new page
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = true;
-                    $this->_setNewPage();
-
-                    // new position
-                    HTML2PDF::$_tables[$param['num']]['page']++;
-                    HTML2PDF::$_tables[$param['num']]['curr_y'] = $this->pdf->getY();
-                    HTML2PDF::$_tables[$param['num']]['td_y'] = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['marge']['t'];
-
-                    // if we have the height of the tbale on the page => draw borders and background
-                    if (isset(HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']])) {
-                        $old = $this->parsingCss->value;
-                        $this->parsingCss->value = HTML2PDF::$_tables[$param['num']]['style_value'];
-
-                        $this->_drawRectangle(
-                            HTML2PDF::$_tables[$param['num']]['curr_x'],
-                            HTML2PDF::$_tables[$param['num']]['curr_y'],
-                            HTML2PDF::$_tables[$param['num']]['width'],
-                            HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']],
-                            $this->parsingCss->value['border'],
-                            $this->parsingCss->value['padding'],
-                            HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
-                            $this->parsingCss->value['background']
-                        );
-
-                        $this->parsingCss->value = $old;
-                    }
-                }
-
-                // if we are in a new page, and if we have a thead => draw it
-                if (HTML2PDF::$_tables[$param['num']]['new_page'] && count(HTML2PDF::$_tables[$param['num']]['thead']['code'])) {
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = false;
-                    $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                    $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                    $oldParsePos = $this->_parsePos;
-                    $oldParseCode = $this->parsingHtml->code;
-
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                    $this->_parsePos = 0;
-                    $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['thead']['code'];
-                    $this->_isInThead = true;
-                    $this->_makeHTMLcode();
-                    $this->_isInThead = false;
-
-                    $this->_parsePos =     $oldParsePos;
-                    $this->parsingHtml->code = $oldParseCode;
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = true;
-                }
-            // else (in a sub HTML)
-            } else {
-                // prepare it
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
-                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
-                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
-
-                HTML2PDF::$_tables[$param['num']]['corr_x']=0;
-                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TR
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TR($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are not in a sub HTML
-            if (!$this->_subPart) {
-
-                // Y of the current line
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    if (HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['rowspan']==1) {
-                        $ty = HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h'];
-                    }
-                }
-
-                // new position
-                HTML2PDF::$_tables[$param['num']]['td_x'] = HTML2PDF::$_tables[$param['num']]['curr_x']+HTML2PDF::$_tables[$param['num']]['marge']['l'];
-                HTML2PDF::$_tables[$param['num']]['td_y']+= $ty;
-                HTML2PDF::$_tables[$param['num']]['new_page'] = false;
-            } else {
-                HTML2PDF::$_tables[$param['num']]['corr_y']++;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TD
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TD($param, $other = 'td')
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $param['cellpadding'] = HTML2PDF::$_tables[$param['num']]['cellpadding'].'mm';
-            $param['cellspacing'] = HTML2PDF::$_tables[$param['num']]['cellspacing'].'mm';
-
-            // specific style for LI
-            if ($other=='li') {
-                $specialLi = true;
-            } else {
-                $specialLi = false;
-                if ($other=='li_sub') {
-                    $param['style']['border'] = 'none';
-                    $param['style']['background-color']    = 'transparent';
-                    $param['style']['background-image']    = 'none';
-                    $param['style']['background-position'] = '';
-                    $param['style']['background-repeat']   = '';
-                    $other = 'li';
-                }
-            }
-
-            // get the properties of the TD
-            $x = HTML2PDF::$_tables[$param['num']]['td_curr'];
-            $y = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-            $colspan = isset($param['colspan']) ? $param['colspan'] : 1;
-            $rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
-
-            // flag for collapse table
-            $collapse = false;
-
-            // specific traitment for TD and TH
-            if (in_array($other, array('td', 'th'))) {
-                // id of the column
-                $numCol = isset(HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr']) ? HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] : HTML2PDF::$_tables[$param['num']]['corr_x'];
-
-                // we get the properties of the COL tag, if exist
-                if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol])) {
-
-                    $colParam = HTML2PDF::$_tables[$param['num']]['cols'][$numCol];
-
-                    // for colspans => we get all the neede widths
-                    $colParam['style']['width'] = array();
-                    for ($k=0; $k<$colspan; $k++) {
-                        if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'])) {
-                            $colParam['style']['width'][] = HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'];
-                        }
-                    }
-
-                    // calculate the total width of the column
-                    $total = '';
-                    $last = $this->parsingCss->getLastWidth();
-                    if (count($colParam['style']['width'])) {
-                        $total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
-                        foreach ($colParam['style']['width'] as $width) {
-                            if (substr($total, -1)=='%' && substr($width, -1)=='%')
-                                $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-                            else
-                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
-                        }
-                    }
-
-                    // get the final width
-                    if ($total) {
-                        $colParam['style']['width'] = $total;
-                    } else {
-                        unset($colParam['style']['width']);
-                    }
-
-
-                    // merge the styles of the COL and the TD
-                    $param['style'] = array_merge($colParam['style'], $param['style']);
-
-                    // merge the class of the COL and the TD
-                    if (isset($colParam['class'])) {
-                        $param['class'] = $colParam['class'].(isset($param['class']) ? ' '.$param['class'] : '');
-                    }
-                }
-
-                $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-            }
-
-            $this->parsingCss->save();
-
-            // legacy for TD and TH
-            $legacy = null;
-            if (in_array($other, array('td', 'th'))) {
-                $legacy = array();
-
-                $old = $this->parsingCss->getLastValue('background');
-                if ($old && ($old['color'] || $old['image']))
-                    $legacy['background'] = $old;
-
-                if (HTML2PDF::$_tables[$param['num']]['border']) {
-                    $legacy['border'] = array();
-                    $legacy['border']['l'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['t'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['r'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['b'] = HTML2PDF::$_tables[$param['num']]['border'];
-                }
-            }
-            $return = $this->parsingCss->analyse($other, $param, $legacy);
-
-            if ($specialLi) {
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetWidth());
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetPadding());
-            }
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if tale collapse => modify the borders
-            if ($collapse) {
-                if (!$this->_subPart) {
-                    if (
-                        (HTML2PDF::$_tables[$param['num']]['tr_curr']>1 && !HTML2PDF::$_tables[$param['num']]['new_page']) ||
-                        (!$this->_isInThead && count(HTML2PDF::$_tables[$param['num']]['thead']['code']))
-                    ) {
-                        $this->parsingCss->value['border']['t'] = $this->parsingCss->readBorder('none');
-                    }
-                }
-
-                if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
-                    if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
-                    $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
-                }
-            }
-
-            // margins of the table
-            $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-                // new position in the table
-                HTML2PDF::$_tables[$param['num']]['td_curr']++;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x] = array();
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] = HTML2PDF::$_tables[$param['num']]['corr_x'];
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Yr'] = HTML2PDF::$_tables[$param['num']]['corr_y'];
-
-                // prepare the mapping for rowspan and colspan
-                for ($j=0; $j<$rowspan; $j++) {
-                    for ($i=0; $i<$colspan; $i++) {
-                        HTML2PDF::$_tables[$param['num']]['corr']
-                            [HTML2PDF::$_tables[$param['num']]['corr_y']+$j]
-                            [HTML2PDF::$_tables[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
-                    }
-                }
-                HTML2PDF::$_tables[$param['num']]['corr_x']+= $colspan;
-                while (isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
-                }
-
-                // extract the content of the TD, and calculate his size
-                $level = $this->parsingHtml->getLevel($this->_tempPos);
-                $this->_createSubHTML($this->_subHtml);
-                $this->_subHtml->parsingHtml->code = $level;
-                $this->_subHtml->_makeHTMLcode();
-                $this->_tempPos+= count($level);
-            } else {
-                // new position in the table
-                HTML2PDF::$_tables[$param['num']]['td_curr']++;
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'];
-
-                // borders and background of the TD
-                $this->_drawRectangle(
-                    HTML2PDF::$_tables[$param['num']]['td_x'],
-                    HTML2PDF::$_tables[$param['num']]['td_y'],
-                    HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'],
-                    HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'],
-                    $this->parsingCss->value['border'],
-                    $this->parsingCss->value['padding'],
-                    HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
-                    $this->parsingCss->value['background']
-                );
-
-                $this->parsingCss->value['width'] = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
-
-                // marges = size of the TD
-                $mL = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-                $this->_saveMargin($mL, 0, $mR);
-
-                // position of the content, from vertical-align
-                $hCorr = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'];
-                $hReel = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['real_h'];
-                switch($this->parsingCss->value['vertical-align'])
-                {
-                    case 'bottom':
-                        $yCorr = $hCorr-$hReel;
-                        break;
-
-                    case 'middle':
-                        $yCorr = ($hCorr-$hReel)*0.5;
-                        break;
-
-                    case 'top':
-                    default:
-                        $yCorr = 0;
-                        break;
-                }
-
-                //  position of the content
-                $x = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
-                $y = HTML2PDF::$_tables[$param['num']]['td_y']+$marge['t']+$yCorr;
-                $this->pdf->setXY($x, $y);
-                $this->_setNewPositionForNewLine();
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TD
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_TD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // get the margins
-            $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-            $marge['t']+= 0.001;
-            $marge['r']+= 0.001;
-            $marge['b']+= 0.001;
-            $marge['l']+= 0.001;
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-
-                // it msut take only one page
-                if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage()>1) {
-                    throw new HTML2PDF_exception(7);
-                }
-
-                // size of the content of the TD
-                $w0 = $this->_subHtml->_maxX + $marge['l'] + $marge['r'];
-                $h0 = $this->_subHtml->_maxY + $marge['t'] + $marge['b'];
-
-                // size from the CSS style
-                $w2 = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'];
-                $h2 = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
-
-                // final size of the TD
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
-
-                // real position of the content
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_w'] = $w0;
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_h'] = $h0;
-
-                // destroy the sub HTML
-                $this->_destroySubHTML($this->_subHtml);
-            } else {
-                $this->_loadMargin();
-
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'];
-            }
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-
-        /**
-         * tag : TH
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TH($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-
-            $this->_tag_open_TD($param, 'th');
-
-            return true;
-        }
-
-        /**
-         * tag : TH
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TH($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TD($param);
-
-            $this->parsingCss->load();
-
-            return true;
-        }
-
-        /**
-         * tag : IMG
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_IMG($param)
-        {
-            $src    = str_replace('&amp;', '&', $param['src']);
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['width']    = 0;
-            $this->parsingCss->value['height']    = 0;
-            $this->parsingCss->value['border']    = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-            $this->parsingCss->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-            $this->parsingCss->analyse('img', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $res = $this->_drawImage($src, isset($param['sub_li']));
-            if (!$res) return $res;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_maxE++;
-
-            return true;
-        }
-
-        /**
-         * tag : SELECT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_SELECT($param)
-        {
-            if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-            }
-
-            $param['name'] = strtolower($param['name']);
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('select', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $this->_lstSelect = array();
-            $this->_lstSelect['name']    = $param['name'];
-            $this->_lstSelect['multi']    = isset($param['multiple']) ? true : false;
-            $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
-            $this->_lstSelect['options']    = array();
-
-            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
-
-            return true;
-        }
-
-        /**
-         * tag : OPTION
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_OPTION($param)
-        {
-            // get the content of the option : it is the text of the option
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-            $value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_'.(count($this->_lstSelect)+1);
-
-            $this->_lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-
-            return true;
-        }
-
-        /**
-         * tag : OPTION
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_OPTION($param)
-        {
-            // nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : SELECT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SELECT()
-        {
-            // position of the select
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
-
-            // width
-            $w = $this->parsingCss->value['width']; if (!$w) $w = 50;
-
-            // height (automatic)
-            $h = ($f*1.07*$this->_lstSelect['size'] + 1);
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            // multy select
-            if ($this->_lstSelect['multi']) {
-                $prop['multipleSelection'] = 'true';
-            }
-
-
-            // single or multi select
-            if ($this->_lstSelect['size']>1) {
-                $this->pdf->ListBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-            } else {
-                $this->pdf->ComboBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_lstSelect = array();
-
-            return true;
-        }
-
-        /**
-         * tag : TEXTAREA
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_TEXTAREA($param)
-        {
-            if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-            }
-
-            $param['name'] = strtolower($param['name']);
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('textarea', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $fx = 0.65*$this->parsingCss->value['font-size'];
-            $fy = 1.08*$this->parsingCss->value['font-size'];
-
-            // extract the content the textarea : value
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-
-            // automatic size, from cols and rows properties
-            $w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1;
-            $h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            $prop['multiline'] = true;
-            $prop['value'] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-
-            $this->pdf->TextField($param['name'], $w, $h, $prop, array(), $x, $y);
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            return true;
-        }
-
-        /**
-         * tag : TEXTAREA
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TEXTAREA()
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INPUT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_INPUT($param)
-        {
-            if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
-            if (!isset($param['value'])) $param['value'] = '';
-            if (!isset($param['type']))  $param['type']  = 'text';
-
-            $param['name'] = strtolower($param['name']);
-            $param['type'] = strtolower($param['type']);
-
-            // the type must be valid
-            if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) {
-                $param['type'] = 'text';
-            }
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('input', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $name = $param['name'];
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            switch($param['type'])
-            {
-                case 'checkbox':
-                    $w = 3;
-                    $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
-                    $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
-                    break;
-
-                case 'radio':
-                    $w = 3;
-                    $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
-                    $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
-                    break;
-
-                case 'hidden':
-                    $w = 0;
-                    $h = 0;
-                    $prop['value'] = $param['value'];
-                    $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                    break;
-
-                case 'text':
-                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
-                    $h = $f*1.3;
-                    $prop['value'] = $param['value'];
-                    $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                    break;
-
-                case 'submit':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                case 'reset':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = array('S'=>'ResetForm');
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                case 'button':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = isset($param['onclick']) ? $param['onclick'] : '';
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                default:
-                    $w = 0;
-                    $h = 0;
-                    break;
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DRAW
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_DRAW($param)
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', true);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('draw', $param);
-            $this->parsingCss->fontSet();
-
-            $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            $overW = $this->parsingCss->value['width'];
-            $overH = $this->parsingCss->value['height'];
-            $this->parsingCss->value['old_maxX'] = $this->_maxX;
-            $this->parsingCss->value['old_maxY'] = $this->_maxY;
-            $this->parsingCss->value['old_maxH'] = $this->_maxH;
-
-            $w = $this->parsingCss->value['width'];
-            $h = $this->parsingCss->value['height'];
-
-            if (!$this->parsingCss->value['position']) {
-                if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
-
-                if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
-                        !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
-
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-            } else {
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-                $this->_saveMax();
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-
-            $this->_drawRectangle(
-                $this->parsingCss->value['x'],
-                $this->parsingCss->value['y'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height'],
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                0,
-                $this->parsingCss->value['background']
-            );
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-            $overW-= $marge['l']+$marge['r'];
-            $overH-= $marge['t']+$marge['b'];
-
-            // clipping to draw only in the size opf the DRAW tag
-            $this->pdf->clippingPathStart(
-                $this->parsingCss->value['x']+$marge['l'],
-                $this->parsingCss->value['y']+$marge['t'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height']
-            );
-
-            // left and right of the DRAW tag
-            $mL = $this->parsingCss->value['x']+$marge['l'];
-            $mR = $this->pdf->getW() - $mL - $overW;
-
-            // position of the DRAW tag
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t'];
-
-            // prepare the drawing area
-            $this->_saveMargin($mL, 0, $mR);
-            $this->pdf->setXY($x, $y);
-
-            // we are in a draw tag
-            $this->_isInDraw = array(
-                'x' => $x,
-                'y' => $y,
-                'w' => $overW,
-                'h' => $overH,
-            );
-
-            // init the translate matrix : (0,0) => ($x, $y)
-            $this->pdf->doTransform(array(1,0,0,1,$x,$y));
-            $this->pdf->SetAlpha(1.);
-            return true;
-        }
-
-        /**
-         * tag : DRAW
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_DRAW($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->pdf->SetAlpha(1.);
-            $this->pdf->undoTransform();
-            $this->pdf->clippingPathStop();
-
-            $this->_maxX = $this->parsingCss->value['old_maxX'];
-            $this->_maxY = $this->parsingCss->value['old_maxY'];
-            $this->_maxH = $this->parsingCss->value['old_maxH'];
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-            $x = $this->parsingCss->value['x'];
-            $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b'];
-
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
-
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-                $this->_maxE++;
-            } else {
-                // position
-                $this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-                $this->_loadMax();
-            }
-
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_loadMargin();
-
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', false);
-
-            $this->_isInDraw = null;
-
-            return true;
-        }
-
-        /**
-         * tag : LINE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LINE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'LINE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $styles['fill'] = null;
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $x1 = isset($param['x1']) ? $this->parsingCss->ConvertToMM($param['x1'], $this->_isInDraw['w']) : 0.;
-            $y1 = isset($param['y1']) ? $this->parsingCss->ConvertToMM($param['y1'], $this->_isInDraw['h']) : 0.;
-            $x2 = isset($param['x2']) ? $this->parsingCss->ConvertToMM($param['x2'], $this->_isInDraw['w']) : 0.;
-            $y2 = isset($param['y2']) ? $this->parsingCss->ConvertToMM($param['y2'], $this->_isInDraw['h']) : 0.;
-            $this->pdf->svgLine($x1, $y1, $x2, $y2);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : RECT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_RECT($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'RECT');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $x = isset($param['x']) ? $this->parsingCss->ConvertToMM($param['x'], $this->_isInDraw['w']) : 0.;
-            $y = isset($param['y']) ? $this->parsingCss->ConvertToMM($param['y'], $this->_isInDraw['h']) : 0.;
-            $w = isset($param['w']) ? $this->parsingCss->ConvertToMM($param['w'], $this->_isInDraw['w']) : 0.;
-            $h = isset($param['h']) ? $this->parsingCss->ConvertToMM($param['h'], $this->_isInDraw['h']) : 0.;
-
-            $this->pdf->svgRect($x, $y, $w, $h, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : CIRCLE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_CIRCLE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'CIRCLE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
-            $cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
-            $r = isset($param['r']) ? $this->parsingCss->ConvertToMM($param['r'], $this->_isInDraw['w']) : 0.;
-            $this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : ELLIPSE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_ELLIPSE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'ELLIPSE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
-            $cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
-            $rx = isset($param['ry']) ? $this->parsingCss->ConvertToMM($param['rx'], $this->_isInDraw['w']) : 0.;
-            $ry = isset($param['rx']) ? $this->parsingCss->ConvertToMM($param['ry'], $this->_isInDraw['h']) : 0.;
-            $this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-
-        /**
-         * tag : POLYLINE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_POLYLINE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = isset($param['points']) ? $param['points'] : null;
-            if ($path) {
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-                // prepare the path
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
-                    $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
-                    );
-                }
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : POLYGON
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_POLYGON($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = (isset($param['points']) ? $param['points'] : null);
-            if ($path) {
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-                // prepare the path
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
-                    $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
-                    );
-                }
-                $actions[] = array('z');
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : PATH
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PATH($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'PATH');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = isset($param['d']) ? $param['d'] : null;
-
-            if ($path) {
-                // prepare the path
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path);
-                $path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-                $path = preg_replace('/ ([a-z]{2})/', '$1', $path);
-
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                // read each actions in the path
-                $actions = array();
-                $action = array();
-                $lastAction = null; // last action found
-                for ($k=0; $k<count($path);true) {
-
-                    // for this actions, we can not have multi coordonate
-                    if (in_array($lastAction, array('z', 'Z'))) {
-                        $lastAction = null;
-                    }
-
-                    // read the new action (forcing if no action before)
-                    if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction===null) {
-                        $lastAction = $path[$k];
-                        $k++;
-                    }
-
-                    // current action
-                    $action = array();
-                    $action[] = $lastAction;
-                    switch($lastAction)
-                    {
-                        case 'C':
-                        case 'c':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+4], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['h']);    // y
-                            $k+= 6;
-                            break;
-
-                        case 'Q':
-                        case 'S':
-                        case 'q':
-                        case 's':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y
-                            $k+= 4;
-                            break;
-
-                        case 'A':
-                        case 'a':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // rx
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // ry
-                            $action[] = 1.*$path[$k+2];                                                        // angle de deviation de l'axe X
-                            $action[] = ($path[$k+3]=='1') ? 1 : 0;                                            // large-arc-flag
-                            $action[] = ($path[$k+4]=='1') ? 1 : 0;                                            // sweep-flag
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+6], $this->_isInDraw['h']);    // y
-                            $k+= 7;
-                            break;
-
-                        case 'M':
-                        case 'L':
-                        case 'T':
-                        case 'm':
-                        case 'l':
-                        case 't':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y
-                            $k+= 2;
-                            break;
-
-                        case 'H':
-                        case 'h':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $k+= 1;
-                            break;
-
-                        case 'V':
-                        case 'v':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['h']);    // y
-                            $k+= 1;
-                            break;
-
-                        case 'z':
-                        case 'Z':
-                        default:
-                            break;
-                    }
-                    // add the action
-                    $actions[] = $action;
-                }
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : G
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_G($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'G');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-        }
-
-        /**
-         * tag : G
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_G($param)
-        {
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * new page for the automatic Index, does not use thie method. Only HTML2PDF_myPdf could use it !!!!
-         *
-         * @param  &int $page
-         * @return integer $oldPage
-         */
-        public function _INDEX_NewPage(&$page)
-        {
-            if ($page) {
-                $oldPage = $this->pdf->getPage();
-                $this->pdf->setPage($page);
-                $this->pdf->setXY($this->_margeLeft, $this->_margeTop);
-                $this->_maxH = 0;
-                $page++;
-                return $oldPage;
-            } else {
-                $this->_setNewPage();
-                return null;
-            }
-        }
-
-    }
+			exit;
+		}
+
+		/**
+		 * set the default margins of the page
+		 *
+		 * @access protected
+		 * @param  int $left   (mm, left margin)
+		 * @param  int $top    (mm, top margin)
+		 * @param  int $right  (mm, right margin, if null => left=right)
+		 * @param  int $bottom (mm, bottom margin, if null => bottom=8mm)
+		 */
+		protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
+		{
+			if ($right===null)  $right = $left;
+			if ($bottom===null) $bottom = 8;
+
+			$this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
+			$this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
+			$this->_defaultRight  = $this->parsingCss->ConvertToMM($right.'mm');
+			$this->_defaultBottom = $this->parsingCss->ConvertToMM($bottom.'mm');
+		}
+
+		/**
+		 * create a new page
+		 *
+		 * @access protected
+		 * @param  mixed   $format
+		 * @param  string  $orientation
+		 * @param  array   $background background information
+		 * @param  integer $curr real position in the html parseur (if break line in the write of a text)
+		 * @param  boolean $resetPageNumber
+		 */
+		protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber=false)
+		{
+			$this->_firstPage = false;
+
+			$this->_format = $format ? $format : $this->_format;
+			$this->_orientation = $orientation ? $orientation : $this->_orientation;
+			$this->_background = $background!==null ? $background : $this->_background;
+			$this->_maxY = 0;
+			$this->_maxX = 0;
+			$this->_maxH = 0;
+			$this->_maxE = 0;
+
+			$this->pdf->SetMargins($this->_defaultLeft, $this->_defaultTop, $this->_defaultRight);
+
+			if ($resetPageNumber) {
+				$this->pdf->startPageGroup();
+			}
+
+			$this->pdf->AddPage($this->_orientation, $this->_format);
+
+			if ($resetPageNumber) {
+				$this->pdf->myStartPageGroup();
+			}
+
+			$this->_page++;
+
+			if (!$this->_subPart && !$this->_isSubPart) {
+				if (is_array($this->_background)) {
+					if (isset($this->_background['color']) && $this->_background['color']) {
+						$this->pdf->setFillColorArray($this->_background['color']);
+						$this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
+					}
+
+					if (isset($this->_background['img']) && $this->_background['img'])
+						$this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
+				}
+
+				$this->_setPageHeader();
+				$this->_setPageFooter();
+			}
+
+			$this->_setMargins();
+			$this->pdf->setY($this->_margeTop);
+
+			$this->_setNewPositionForNewLine($curr);
+			$this->_maxH = 0;
+		}
+
+		/**
+		 * set the real margin, using the default margins and the page margins
+		 *
+		 * @access protected
+		 */
+		protected function _setMargins()
+		{
+			// prepare the margins
+			$this->_margeLeft   = $this->_defaultLeft   + (isset($this->_background['left'])   ? $this->_background['left']   : 0);
+			$this->_margeRight  = $this->_defaultRight  + (isset($this->_background['right'])  ? $this->_background['right']  : 0);
+			$this->_margeTop    = $this->_defaultTop    + (isset($this->_background['top'])    ? $this->_background['top']    : 0);
+			$this->_margeBottom = $this->_defaultBottom + (isset($this->_background['bottom']) ? $this->_background['bottom'] : 0);
+
+			// set the PDF margins
+			$this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
+
+			// set the float Margins
+			$this->_pageMarges = array();
+			if ($this->_isInParagraph!==false) {
+				$this->_pageMarges[floor($this->_margeTop*100)] = array($this->_isInParagraph[0], $this->pdf->getW()-$this->_isInParagraph[1]);
+			} else {
+				$this->_pageMarges[floor($this->_margeTop*100)] = array($this->_margeLeft, $this->pdf->getW()-$this->_margeRight);
+			}
+		}
+
+		/**
+		 * add a debug step
+		 *
+		 * @access protected
+		 * @param  string  $name step name
+		 * @param  boolean $level (true=up, false=down, null=nothing to do)
+		 * @return $this
+		 */
+		protected function _DEBUG_add($name, $level=null)
+		{
+			// if true : UP
+			if ($level===true) $this->_debugLevel++;
+
+			$name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
+			$time  = microtime(true);
+			$usage = ($this->_debugOkUsage ? memory_get_usage() : 0);
+			$peak  = ($this->_debugOkPeak ? memory_get_peak_usage() : 0);
+
+			$this->_DEBUG_stepline(
+				$name,
+				number_format(($time - $this->_debugStartTime)*1000, 1, '.', ' ').' ms',
+				number_format(($time - $this->_debugLastTime)*1000, 1, '.', ' ').' ms',
+				number_format($usage/1024, 1, '.', ' ').' Ko',
+				number_format($peak/1024, 1, '.', ' ').' Ko'
+			);
+
+			$this->_debugLastTime = $time;
+
+			// it false : DOWN
+			if ($level===false) $this->_debugLevel--;
+
+			return $this;
+		}
+
+		/**
+		 * display a debug line
+		 *
+		 *
+		 * @access protected
+		 * @param  string $name
+		 * @param  string $timeTotal
+		 * @param  string $timeStep
+		 * @param  string $memoryUsage
+		 * @param  string $memoryPeak
+		 */
+		protected function _DEBUG_stepline($name, $timeTotal, $timeStep, $memoryUsage, $memoryPeak)
+		{
+			$txt = str_pad($name, 30, ' ', STR_PAD_RIGHT).
+					str_pad($timeTotal, 12, ' ', STR_PAD_LEFT).
+					str_pad($timeStep, 12, ' ', STR_PAD_LEFT).
+					str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT).
+					str_pad($memoryPeak, 15, ' ', STR_PAD_LEFT);
+
+			echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
+		}
+
+		/**
+		 * get the Min and Max X, for Y (use the float margins)
+		 *
+		 * @access protected
+		 * @param  float $y
+		 * @return array(float, float)
+		 */
+		protected function _getMargins($y)
+		{
+			$y = floor($y*100);
+			$x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
+
+			foreach ($this->_pageMarges as $mY => $mX)
+				if ($mY<=$y) $x = $mX;
+
+			return $x;
+		}
+
+		/**
+		 * Add margins, for a float
+		 *
+		 * @access protected
+		 * @param  string $float (left / right)
+		 * @param  float  $xLeft
+		 * @param  float  $yTop
+		 * @param  float  $xRight
+		 * @param  float  $yBottom
+		 */
+		protected function _addMargins($float, $xLeft, $yTop, $xRight, $yBottom)
+		{
+			// get the current float margins, for top and bottom
+			$oldTop    = $this->_getMargins($yTop);
+			$oldBottom = $this->_getMargins($yBottom);
+
+			// update the top float margin
+			if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
+			if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
+
+			$yTop = floor($yTop*100);
+			$yBottom = floor($yBottom*100);
+
+			// erase all the float margins that are smaller than the new one
+			foreach ($this->_pageMarges as $mY => $mX) {
+				if ($mY<$yTop) continue;
+				if ($mY>$yBottom) break;
+				if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
+				if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
+			}
+
+			// save the new Top and Bottom margins
+			$this->_pageMarges[$yTop] = $oldTop;
+			$this->_pageMarges[$yBottom] = $oldBottom;
+
+			// sort the margins
+			ksort($this->_pageMarges);
+
+			// we are just after float
+			$this->_isAfterFloat = true;
+		}
+
+		/**
+		 * Save old margins (push), and set new ones
+		 *
+		 * @access protected
+		 * @param  float  $ml left margin
+		 * @param  float  $mt top margin
+		 * @param  float  $mr right margin
+		 */
+		protected function _saveMargin($ml, $mt, $mr)
+		{
+			// save old margins
+			$this->_marges[] = array('l' => $this->pdf->getlMargin(), 't' => $this->pdf->gettMargin(), 'r' => $this->pdf->getrMargin(), 'page' => $this->_pageMarges);
+
+			// set new ones
+			$this->pdf->SetMargins($ml, $mt, $mr);
+
+			// prepare for float margins
+			$this->_pageMarges = array();
+			$this->_pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
+		}
+
+		/**
+		 * load the last saved margins (pop)
+		 *
+		 * @access protected
+		 */
+		protected function _loadMargin()
+		{
+			$old = array_pop($this->_marges);
+			if ($old) {
+				$ml = $old['l'];
+				$mt = $old['t'];
+				$mr = $old['r'];
+				$mP = $old['page'];
+			} else {
+				$ml = $this->_margeLeft;
+				$mt = 0;
+				$mr = $this->_margeRight;
+				$mP = array($mt => array($ml, $this->pdf->getW()-$mr));
+			}
+
+			$this->pdf->SetMargins($ml, $mt, $mr);
+			$this->_pageMarges = $mP;
+		}
+
+		/**
+		 * save the current maxs (push)
+		 *
+		 * @access protected
+		 */
+		protected function _saveMax()
+		{
+			$this->_maxSave[] = array($this->_maxX, $this->_maxY, $this->_maxH, $this->_maxE);
+		}
+
+		/**
+		 * load the last saved current maxs (pop)
+		 *
+		 * @access protected
+		 */
+		protected function _loadMax()
+		{
+			$old = array_pop($this->_maxSave);
+
+			if ($old) {
+				$this->_maxX = $old[0];
+				$this->_maxY = $old[1];
+				$this->_maxH = $old[2];
+				$this->_maxE = $old[3];
+			} else {
+				$this->_maxX = 0;
+				$this->_maxY = 0;
+				$this->_maxH = 0;
+				$this->_maxE = 0;
+			}
+		}
+
+		/**
+		 * draw the PDF header with the HTML in page_header
+		 *
+		 * @access protected
+		 */
+		protected function _setPageHeader()
+		{
+			if (!count($this->_subHEADER)) return false;
+
+			$oldParsePos = $this->_parsePos;
+			$oldParseCode = $this->parsingHtml->code;
+
+			$this->_parsePos = 0;
+			$this->parsingHtml->code = $this->_subHEADER;
+			$this->_makeHTMLcode();
+
+			$this->_parsePos = $oldParsePos;
+			$this->parsingHtml->code = $oldParseCode;
+		}
+
+		/**
+		 * draw the PDF footer with the HTML in page_footer
+		 *
+		 * @access protected
+		 */
+		protected function _setPageFooter()
+		{
+			if (!count($this->_subFOOTER)) return false;
+
+			$oldParsePos = $this->_parsePos;
+			$oldParseCode = $this->parsingHtml->code;
+
+			$this->_parsePos = 0;
+			$this->parsingHtml->code = $this->_subFOOTER;
+			$this->_isInFooter = true;
+			$this->_makeHTMLcode();
+			$this->_isInFooter = false;
+
+			$this->_parsePos = $oldParsePos;
+			$this->parsingHtml->code = $oldParseCode;
+		}
+
+		/**
+		 * new line, with a specific height
+		 *
+		 * @access protected
+		 * @param float   $h
+		 * @param integer $curr real current position in the text, if new line in the write of a text
+		 */
+		protected function _setNewLine($h, $curr = null)
+		{
+			$this->pdf->Ln($h);
+			$this->_setNewPositionForNewLine($curr);
+		}
+
+		/**
+		 * calculate the start position of the next line,  depending on the text-align
+		 *
+		 * @access protected
+		 * @param  integer $curr real current position in the text, if new line in the write of a text
+		 */
+		protected function _setNewPositionForNewLine($curr = null)
+		{
+			// get the margins for the current line
+			list($lx, $rx) = $this->_getMargins($this->pdf->getY());
+			$this->pdf->setX($lx);
+			$wMax = $rx-$lx;
+			$this->_currentH = 0;
+
+			// if subPart => return because align left
+			if ($this->_subPart || $this->_isSubPart || $this->_isForOneLine) {
+				$this->pdf->setWordSpacing(0);
+				return null;
+			}
+
+			// create the sub object
+			$sub = null;
+			$this->_createSubHTML($sub);
+			$sub->_saveMargin(0, 0, $sub->pdf->getW()-$wMax);
+			$sub->_isForOneLine = true;
+			$sub->_parsePos = $this->_parsePos;
+			$sub->parsingHtml->code = $this->parsingHtml->code;
+
+			// if $curr => adapt the current position of the parsing
+			if ($curr!==null && $sub->parsingHtml->code[$this->_parsePos]['name']=='write') {
+				$txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
+				$txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
+				$sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
+			} else
+				$sub->_parsePos++;
+
+			// for each element of the parsing => load the action
+			$res = null;
+			for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
+				$action = $sub->parsingHtml->code[$sub->_parsePos];
+				$res = $sub->_executeAction($action);
+				if (!$res) break;
+			}
+
+			$w = $sub->_maxX; // max width
+			$h = $sub->_maxH; // max height
+			$e = ($res===null ? $sub->_maxE : 0); // maxnumber of elemets on the line
+
+			// destroy the sub HTML
+			$this->_destroySubHTML($sub);
+
+			// adapt the start of the line, depending on the text-align
+			if ($this->parsingCss->value['text-align']=='center')
+				$this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
+			else if ($this->parsingCss->value['text-align']=='right')
+				$this->pdf->setX($rx-$w-0.01);
+			else
+				$this->pdf->setX($lx);
+
+			// set the height of the line
+			$this->_currentH = $h;
+
+			// if justify => set the word spacing
+			if ($this->parsingCss->value['text-align']=='justify' && $e>1) {
+				$this->pdf->setWordSpacing(($wMax-$w)/($e-1));
+			} else {
+				$this->pdf->setWordSpacing(0);
+			}
+		}
+
+		/**
+		 * prepare HTML2PDF::$_subobj (used for create the sub HTML2PDF objects
+		 *
+		 * @access protected
+		 */
+		protected function _prepareSubObj()
+		{
+			$pdf = null;
+
+			// create the sub object
+			HTML2PDF::$_subobj = new HTML2PDF(
+										$this->_orientation,
+										$this->_format,
+										$this->_langue,
+										$this->_unicode,
+										$this->_encoding,
+										array($this->_defaultLeft,$this->_defaultTop,$this->_defaultRight,$this->_defaultBottom)
+									);
+
+			// init
+			HTML2PDF::$_subobj->setTestTdInOnePage($this->_testTdInOnepage);
+			HTML2PDF::$_subobj->setTestIsImage($this->_testIsImage);
+			HTML2PDF::$_subobj->setTestIsDeprecated($this->_testIsDeprecated);
+			HTML2PDF::$_subobj->setDefaultFont($this->_defaultFont);
+			HTML2PDF::$_subobj->parsingCss->css            = &$this->parsingCss->css;
+			HTML2PDF::$_subobj->parsingCss->cssKeys        = &$this->parsingCss->cssKeys;
+
+			// clone font from the original PDF
+			HTML2PDF::$_subobj->pdf->cloneFontFrom($this->pdf);
+
+			// remove the link to the parent
+			HTML2PDF::$_subobj->parsingCss->setPdfParent($pdf);
+		}
+
+		/**
+		 * create a sub HTML2PDF, to calculate the multi-tables
+		 *
+		 * @access protected
+		 * @param  &HTML2PDF $subHtml sub HTML2PDF to create
+		 * @param  integer   $cellmargin if in a TD : cellmargin of this td
+		 */
+		protected function _createSubHTML(&$subHtml, $cellmargin=0)
+		{
+			// prepare the subObject, if never prepare before
+			if (HTML2PDF::$_subobj===null) {
+				$this->_prepareSubObj();
+			}
+
+			// calculate the width to use
+			if ($this->parsingCss->value['width']) {
+				$marge = $cellmargin*2;
+				$marge+= $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
+				$marge+= $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
+				$marge = $this->pdf->getW() - $this->parsingCss->value['width'] + $marge;
+			} else {
+				$marge = $this->_margeLeft+$this->_margeRight;
+			}
+
+			// BUGFIX : we have to call the method, because of a bug in php 5.1.6
+			HTML2PDF::$_subobj->pdf->getPage();
+
+			// clone the sub oject
+			$subHtml = clone HTML2PDF::$_subobj;
+			$subHtml->parsingCss->table = $this->parsingCss->table;
+			$subHtml->parsingCss->value = $this->parsingCss->value;
+			$subHtml->initSubHtml(
+				$this->_format,
+				$this->_orientation,
+				$marge,
+				$this->_page,
+				$this->_defList,
+				$this->pdf->getMyLastPageGroup(),
+				$this->pdf->getMyLastPageGroupNb()
+			);
+		}
+
+		/**
+		 * destroy a subHTML2PDF
+		 *
+		 * @access protected
+		 */
+		protected function _destroySubHTML(&$subHtml)
+		{
+			unset($subHtml);
+			$subHtml = null;
+		}
+
+		/**
+		 * Convert a arabic number in roman number
+		 *
+		 * @access protected
+		 * @param  integer $nbArabic
+		 * @return string  $nbRoman
+		 */
+		protected function _listeArab2Rom($nbArabic)
+		{
+			$nbBaseTen    = array('I','X','C','M');
+			$nbBaseFive    = array('V','L','D');
+			$nbRoman    = '';
+
+			if ($nbArabic<1)    return $nbArabic;
+			if ($nbArabic>3999) return $nbArabic;
+
+			for ($i=3; $i>=0 ; $i--) {
+				$chiffre=floor($nbArabic/pow(10, $i));
+				if ($chiffre>=1) {
+					$nbArabic=$nbArabic-$chiffre*pow(10, $i);
+					if ($chiffre<=3) {
+						for ($j=$chiffre; $j>=1; $j--) {
+							$nbRoman=$nbRoman.$nbBaseTen[$i];
+						}
+					} else if ($chiffre==9) {
+						$nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseTen[$i+1];
+					} else if ($chiffre==4) {
+					$nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseFive[$i];
+					} else {
+						$nbRoman=$nbRoman.$nbBaseFive[$i];
+						for ($j=$chiffre-5; $j>=1; $j--) {
+							$nbRoman=$nbRoman.$nbBaseTen[$i];
+						}
+					}
+				}
+			}
+			return $nbRoman;
+		}
+
+		/**
+		 * add a LI to the current level
+		 *
+		 * @access protected
+		 */
+		protected function _listeAddLi()
+		{
+			$this->_defList[count($this->_defList)-1]['nb']++;
+		}
+
+		/**
+		 * get the width to use for the column of the list
+		 *
+		 * @access protected
+		 * @return string $width
+		 */
+		protected function _listeGetWidth()
+		{
+			return '7mm';
+		}
+
+		/**
+		 * get the padding to use for the column of the list
+		 *
+		 * @access protected
+		 * @return string $padding
+		 */
+		protected function _listeGetPadding()
+		{
+			return '1mm';
+		}
+
+		/**
+		 * get the information of the li on the current level
+		 *
+		 * @access protected
+		 * @return array(fontName, small size, string)
+		 */
+		protected function _listeGetLi()
+		{
+			$im = $this->_defList[count($this->_defList)-1]['img'];
+			$st = $this->_defList[count($this->_defList)-1]['style'];
+			$nb = $this->_defList[count($this->_defList)-1]['nb'];
+			$up = (substr($st, 0, 6)=='upper-');
+
+			if ($im) return array(false, false, $im);
+
+			switch($st)
+			{
+				case 'none':
+					return array('helvetica', true, ' ');
+
+				case 'upper-alpha':
+				case 'lower-alpha':
+					$str = '';
+					while ($nb>26) {
+						$str = chr(96+$nb%26).$str;
+						$nb = floor($nb/26);
+					}
+					$str = chr(96+$nb).$str;
+
+					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+
+				case 'upper-roman':
+				case 'lower-roman':
+					$str = $this->_listeArab2Rom($nb);
+
+					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+
+				case 'decimal':
+					return array('helvetica', false, $nb.'.');
+
+				case 'square':
+					return array('zapfdingbats', true, chr(110));
+
+				case 'circle':
+					return array('zapfdingbats', true, chr(109));
+
+				case 'disc':
+				default:
+					return array('zapfdingbats', true, chr(108));
+			}
+		}
+
+		/**
+		 * add a level to the list
+		 *
+		 * @access protected
+		 * @param  string $type  : ul, ol
+		 * @param  string $style : lower-alpha, ...
+		 * @param  string $img
+		 */
+		protected function _listeAddLevel($type = 'ul', $style = '', $img = null)
+		{
+			// get the url of the image, if we want to use a image
+			if ($img) {
+				if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match)) {
+					$img = $match[1];
+				} else {
+					$img = null;
+				}
+			} else {
+				$img = null;
+			}
+
+			// prepare the datas
+			if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
+			if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
+
+			if (!$style) {
+				if ($type=='ul')    $style = 'disc';
+				else                $style = 'decimal';
+			}
+
+			// add the new level
+			$this->_defList[count($this->_defList)] = array('style' => $style, 'nb' => 0, 'img' => $img);
+		}
+
+		/**
+		 * remove a level to the list
+		 *
+		 * @access protected
+		 */
+		protected function _listeDelLevel()
+		{
+			if (count($this->_defList)) {
+				unset($this->_defList[count($this->_defList)-1]);
+				$this->_defList = array_values($this->_defList);
+			}
+		}
+
+		/**
+		 * execute the actions to convert the html
+		 *
+		 * @access protected
+		 */
+		protected function _makeHTMLcode()
+		{
+			// foreach elements of the parsing
+			for ($this->_parsePos=0; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+
+				// get the action to do
+				$action = $this->parsingHtml->code[$this->_parsePos];
+
+				// if it is a opening of table / ul / ol
+				if (in_array($action['name'], array('table', 'ul', 'ol')) && !$action['close']) {
+
+					//  we will work as a sub HTML to calculate the size of the element
+					$this->_subPart = true;
+
+					// get the name of the opening tag
+					$tagOpen = $action['name'];
+
+					// save the actual pos on the parsing
+					$this->_tempPos = $this->_parsePos;
+
+					// foreach elements, while we are in the opened tag
+					while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]['name']==$tagOpen && $this->parsingHtml->code[$this->_tempPos]['close'])) {
+						// make the action
+						$this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
+						$this->_tempPos++;
+					}
+
+					// execute the closure of the tag
+					if (isset($this->parsingHtml->code[$this->_tempPos])) {
+						$this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
+					}
+
+					// end of the sub part
+					$this->_subPart = false;
+				}
+
+				// execute the action
+				$this->_executeAction($action);
+			}
+		}
+
+		/**
+		 * execute the action from the parsing
+		 *
+		 * @access protected
+		 * @param  array $action
+		 */
+		protected function _executeAction($action)
+		{
+			// name of the action
+			$fnc = ($action['close'] ? '_tag_close_' : '_tag_open_').strtoupper($action['name']);
+
+			// parameters of the action
+			$param = $action['param'];
+
+			// if it the first action of the first page, and if it is not a open tag of PAGE => create the new page
+			if ($fnc!='_tag_open_PAGE' && $this->_firstPage) {
+				$this->_setNewPage();
+			}
+
+			// the action must exist
+			if (!is_callable(array(&$this, $fnc))) {
+				throw new HTML2PDF_exception(1, strtoupper($action['name']), $this->parsingHtml->getHtmlErrorCode($action['html_pos']));
+			}
+
+			// lauch the action
+			$res = $this->{$fnc}($param);
+
+			// save the name of the action
+			$this->_previousCall = $fnc;
+
+			// return the result
+			return $res;
+		}
+
+		/**
+		 * get the position of the element on the current line, depending on his height
+		 *
+		 * @access protected
+		 * @param  float $h
+		 * @return float
+		 */
+		protected function _getElementY($h)
+		{
+			if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
+				return 0;
+
+			return ($this->_currentH-$h)*0.8;
+		}
+
+		/**
+		 * make a break line
+		 *
+		 * @access protected
+		 * @param  float $h current line height
+		 * @param  integer $curr real current position in the text, if new line in the write of a text
+		 */
+		protected function _makeBreakLine($h, $curr = null)
+		{
+			if ($h) {
+				if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
+					$this->_setNewLine($h, $curr);
+				else
+					$this->_setNewPage(null, '', null, $curr);
+			} else {
+				$this->_setNewPositionForNewLine($curr);
+			}
+
+			$this->_maxH = 0;
+			$this->_maxE = 0;
+		}
+
+		/**
+		 * display a image
+		 *
+		 * @access protected
+		 * @param  string $src
+		 * @param  boolean $subLi if true=image of a list
+		 * @return boolean depending on "isForOneLine"
+		 */
+		protected function _drawImage($src, $subLi=false)
+		{
+			// get the size of the image
+			// WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
+			$infos=@getimagesize($src);
+
+			// if the image does not exist, or can not be loaded
+			if (count($infos)<2) {
+				// if the test is activ => exception
+				if ($this->_testIsImage) {
+					throw new HTML2PDF_exception(6, $src);
+				}
+
+				// else, display a gray rectangle
+				$src = null;
+				$infos = array(16, 16);
+			}
+
+			// convert the size of the image in the unit of the PDF
+			$imageWidth = $infos[0]/$this->pdf->getK();
+			$imageHeight = $infos[1]/$this->pdf->getK();
+
+			// calculate the size from the css style
+			if ($this->parsingCss->value['width'] && $this->parsingCss->value['height']) {
+				$w = $this->parsingCss->value['width'];
+				$h = $this->parsingCss->value['height'];
+			} else if ($this->parsingCss->value['width']) {
+				$w = $this->parsingCss->value['width'];
+				$h = $imageHeight*$w/$imageWidth;
+			} else if ($this->parsingCss->value['height']) {
+				$h = $this->parsingCss->value['height'];
+				$w = $imageWidth*$h/$imageHeight;
+			} else {
+				// convert px to pt
+				$w = 72./96.*$imageWidth;
+				$h = 72./96.*$imageHeight;
+			}
+
+			// are we in a float
+			$float = $this->parsingCss->getFloat();
+
+			// if we are in a float, but if something else if on the line => Break Line
+			if ($float && $this->_maxH) {
+				// make the break line (false if we are in "_isForOneLine" mode)
+				if (!$this->_tag_open_BR(array())) {
+					return false;
+				}
+			}
+
+			// position of the image
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+
+			// if the image can not be put on the current line => new line
+			if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
+				if ($this->_isForOneLine) {
+					return false;
+				}
+
+				// set the new line
+				$hnl = max($this->_maxH, $this->parsingCss->getLineHeight());
+				$this->_setNewLine($hnl);
+
+				// get the new position
+				$x = $this->pdf->getX();
+				$y = $this->pdf->getY();
+			}
+
+			// if the image can not be put on the current page
+			if (($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
+				// new page
+				$this->_setNewPage();
+
+				// get the new position
+				$x = $this->pdf->getX();
+				$y = $this->pdf->getY();
+			}
+
+			// correction for display the image of a list
+			$hT = 0.80*$this->parsingCss->value['font-size'];
+			if ($subLi && $h<$hT) {
+				$y+=($hT-$h);
+			}
+
+			// add the margin top
+			$yc = $y-$this->parsingCss->value['margin']['t'];
+
+			// get the width and the position of the parent
+			$old = $this->parsingCss->getOldValues();
+			if ( $old['width']) {
+				$parentWidth = $old['width'];
+				$parentX = $x;
+			} else {
+				$parentWidth = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				$parentX = $this->pdf->getlMargin();
+			}
+
+			// if we are in a gloat => adapt the parent position and width
+			if ($float) {
+				list($lx, $rx) = $this->_getMargins($yc);
+				$parentX = $lx;
+				$parentWidth = $rx-$lx;
+			}
+
+			// calculate the position of the image, if align to the right
+			if ($parentWidth>$w && $float!='left') {
+				if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+			}
+
+			// display the image
+			if (!$this->_subPart && !$this->_isSubPart) {
+				if ($src) {
+					$this->pdf->Image($src, $x, $y, $w, $h, '', $this->_isInLink);
+				} else {
+					// rectangle if the image can not be loaded
+					$this->pdf->setFillColorArray(array(240, 220, 220));
+					$this->pdf->Rect($x, $y, $w, $h, 'F');
+				}
+			}
+
+			// apply the margins
+			$x-= $this->parsingCss->value['margin']['l'];
+			$y-= $this->parsingCss->value['margin']['t'];
+			$w+= $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
+			$h+= $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
+
+			if ($float=='left') {
+				// save the current max
+				$this->_maxX = max($this->_maxX, $x+$w);
+				$this->_maxY = max($this->_maxY, $y+$h);
+
+				// add the image to the margins
+				$this->_addMargins($float, $x, $y, $x+$w, $y+$h);
+
+				// get the new position
+				list($lx, $rx) = $this->_getMargins($yc);
+				$this->pdf->setXY($lx, $yc);
+			} else if ($float=='right') {
+				// save the current max. We don't save the X because it is not the real max of the line
+				$this->_maxY = max($this->_maxY, $y+$h);
+
+				// add the image to the margins
+				$this->_addMargins($float, $x, $y, $x+$w, $y+$h);
+
+				// get the new position
+				list($lx, $rx) = $this->_getMargins($yc);
+				$this->pdf->setXY($lx, $yc);
+			} else {
+				// set the new position at the end of the image
+				$this->pdf->setX($x+$w);
+
+				// save the current max
+				$this->_maxX = max($this->_maxX, $x+$w);
+				$this->_maxY = max($this->_maxY, $y+$h);
+				$this->_maxH = max($this->_maxH, $h);
+			}
+
+			return true;
+		}
+
+		/**
+		 * draw a rectangle
+		 *
+		 * @access protected
+		 * @param  float $x
+		 * @param  float $y
+		 * @param  float $w
+		 * @param  float $h
+		 * @param  array $border
+		 * @param  float $padding - internal marge of the rectanble => not used, but...
+		 * @param  float $margin  - external marge of the rectanble
+		 * @param  array $background
+		 * @return boolean
+		 */
+		protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
+		{
+			// if we are in a subpart or if height is null => return false
+			if ($this->_subPart || $this->_isSubPart || $h===null) return false;
+
+			// add the margin
+			$x+= $margin;
+			$y+= $margin;
+			$w-= $margin*2;
+			$h-= $margin*2;
+
+			// get the radius of the border
+			$outTL = $border['radius']['tl'];
+			$outTR = $border['radius']['tr'];
+			$outBR = $border['radius']['br'];
+			$outBL = $border['radius']['bl'];
+
+			// prepare the out radius
+			$outTL = ($outTL[0] && $outTL[1]) ? $outTL : null;
+			$outTR = ($outTR[0] && $outTR[1]) ? $outTR : null;
+			$outBR = ($outBR[0] && $outBR[1]) ? $outBR : null;
+			$outBL = ($outBL[0] && $outBL[1]) ? $outBL : null;
+
+			// prepare the in radius
+			$inTL = $outTL;
+			$inTR = $outTR;
+			$inBR = $outBR;
+			$inBL = $outBL;
+
+			if (is_array($inTL)) {
+				$inTL[0]-= $border['l']['width'];
+				$inTL[1]-= $border['t']['width'];
+			}
+			if (is_array($inTR)) {
+				$inTR[0]-= $border['r']['width'];
+				$inTR[1]-= $border['t']['width'];
+			}
+			if (is_array($inBR)) {
+				$inBR[0]-= $border['r']['width'];
+				$inBR[1]-= $border['b']['width'];
+			}
+			if (is_array($inBL)) {
+				$inBL[0]-= $border['l']['width'];
+				$inBL[1]-= $border['b']['width'];
+			}
+
+			if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
+			if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
+			if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
+			if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
+
+			// prepare the background color
+			$pdfStyle = '';
+			if ($background['color']) {
+				$this->pdf->setFillColorArray($background['color']);
+				$pdfStyle.= 'F';
+			}
+
+			// if we have a background to fill => fill it with a path (because of the radius)
+			if ($pdfStyle) {
+				$this->pdf->clippingPathStart($x, $y, $w, $h, $outTL, $outTR, $outBL, $outBR);
+				$this->pdf->Rect($x, $y, $w, $h, $pdfStyle);
+				$this->pdf->clippingPathStop();
+			}
+
+			// prepare the background image
+			if ($background['image']) {
+				$iName      = $background['image'];
+				$iPosition  = $background['position']!==null ? $background['position'] : array(0, 0);
+				$iRepeat    = $background['repeat']!==null   ? $background['repeat']   : array(true, true);
+
+				// size of the background without the borders
+				$bX = $x;
+				$bY = $y;
+				$bW = $w;
+				$bH = $h;
+
+				if ($border['b']['width']) {
+					$bH-= $border['b']['width'];
+				}
+				if ($border['l']['width']) {
+					$bW-= $border['l']['width'];
+					$bX+= $border['l']['width'];
+				}
+				if ($border['t']['width']) {
+					$bH-= $border['t']['width'];
+					$bY+= $border['t']['width'];
+				}
+				if ($border['r']['width']) {
+					$bW-= $border['r']['width'];
+				}
+
+				// get the size of the image
+				// WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
+				$imageInfos=@getimagesize($iName);
+
+				// if the image can not be loaded
+				if (count($imageInfos)<2) {
+					if ($this->_testIsImage) {
+						throw new HTML2PDF_exception(6, $iName);
+					}
+				} else {
+					// convert the size of the image from pixel to the unit of the PDF
+					$imageWidth    = 72./96.*$imageInfos[0]/$this->pdf->getK();
+					$imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
+
+					// prepare the position of the backgroung
+					if ($iRepeat[0]) $iPosition[0] = $bX;
+					else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
+					else $iPosition[0] = $bX+$iPosition[0];
+
+					if ($iRepeat[1]) $iPosition[1] = $bY;
+					else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
+					else $iPosition[1] = $bY+$iPosition[1];
+
+					$imageXmin = $bX;
+					$imageXmax = $bX+$bW;
+					$imageYmin = $bY;
+					$imageYmax = $bY+$bH;
+
+					if (!$iRepeat[0] && !$iRepeat[1]) {
+						$imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
+						$imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
+					} else if ($iRepeat[0] && !$iRepeat[1]) {
+						$imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
+					} else if (!$iRepeat[0] && $iRepeat[1]) {
+						$imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
+					}
+
+					// build the path to display the image (because of radius)
+					$this->pdf->clippingPathStart($bX, $bY, $bW, $bH, $inTL, $inTR, $inBL, $inBR);
+
+					// repeat the image
+					for ($iY=$imageYmin; $iY<$imageYmax; $iY+=$imageHeight) {
+						for ($iX=$imageXmin; $iX<$imageXmax; $iX+=$imageWidth) {
+							$cX = null;
+							$cY = null;
+							$cW = $imageWidth;
+							$cH = $imageHeight;
+							if ($imageYmax-$iY<$imageHeight) {
+								$cX = $iX;
+								$cY = $iY;
+								$cH = $imageYmax-$iY;
+							}
+							if ($imageXmax-$iX<$imageWidth) {
+								$cX = $iX;
+								$cY = $iY;
+								$cW = $imageXmax-$iX;
+							}
+
+							$this->pdf->Image($iName, $iX, $iY, $imageWidth, $imageHeight, '', '');
+						}
+					}
+
+					// end of the path
+					$this->pdf->clippingPathStop();
+				}
+			}
+
+			// adding some loose (0.01mm)
+			$loose = 0.01;
+			$x-= $loose;
+			$y-= $loose;
+			$w+= 2.*$loose;
+			$h+= 2.*$loose;
+			if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
+			if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
+			if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
+			if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
+
+			// prepare the test on borders
+			$testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
+			$testBt = ($border['t']['width'] && $border['t']['color'][0]!==null);
+			$testBr = ($border['r']['width'] && $border['r']['color'][0]!==null);
+			$testBb = ($border['b']['width'] && $border['b']['color'][0]!==null);
+
+			// draw the radius bottom-left
+			if (is_array($outBL) && ($testBb || $testBl)) {
+				if ($inBL) {
+					$courbe = array();
+					$courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
+					$courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
+					$courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$outBL[1];
+					$courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
+				} else {
+					$courbe = array();
+					$courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
+					$courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
+					$courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
+				}
+				$this->_drawCurve($courbe, $border['l']['color']);
+			}
+
+			// draw the radius left-top
+			if (is_array($outTL) && ($testBt || $testBl)) {
+				if ($inTL) {
+					$courbe = array();
+					$courbe[] = $x;                        $courbe[] = $y+$outTL[1];
+					$courbe[] = $x+$outTL[0];              $courbe[] = $y;
+					$courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$outTL[1];
+					$courbe[] = $x+$outTL[0];              $courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
+				} else {
+					$courbe = array();
+					$courbe[] = $x;                        $courbe[] = $y+$outTL[1];
+					$courbe[] = $x+$outTL[0];              $courbe[] = $y;
+					$courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
+				}
+				$this->_drawCurve($courbe, $border['t']['color']);
+			}
+
+			// draw the radius top-right
+			if (is_array($outTR) && ($testBt || $testBr)) {
+				if ($inTR) {
+					$courbe = array();
+					$courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
+					$courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
+					$courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$outTR[1];
+					$courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
+				} else {
+					$courbe = array();
+					$courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
+					$courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
+					$courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
+				}
+				$this->_drawCurve($courbe, $border['r']['color']);
+			}
+
+			// draw the radius right-bottom
+			if (is_array($outBR) && ($testBb || $testBr)) {
+				if ($inBR) {
+					$courbe = array();
+					$courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
+					$courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
+					$courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$outBR[1];
+					$courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
+				} else {
+					$courbe = array();
+					$courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
+					$courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
+					$courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
+				}
+				$this->_drawCurve($courbe, $border['b']['color']);
+			}
+
+			// draw the left border
+			if ($testBl) {
+				$pt = array();
+				$pt[] = $x;                       $pt[] = $y+$h;
+				$pt[] = $x;                       $pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x;                       $pt[] = $y+$border['t']['width'];
+				$pt[] = $x;                       $pt[] = $y;
+				$pt[] = $x+$border['l']['width']; $pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$border['l']['width']; $pt[] = $y+$h-$border['b']['width'];
+
+				$bord = 3;
+				if (is_array($outBL)) {
+					$bord-=1;
+					$pt[3] -= $outBL[1] - $border['b']['width'];
+					if ($inBL) $pt[11]-= $inBL[1];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($outTL)) {
+					$bord-=2;
+					$pt[5] += $outTL[1]-$border['t']['width'];
+					if ($inTL) $pt[9] += $inTL[1];
+					unset($pt[6]);unset($pt[7]);
+				}
+
+				$pt = array_values($pt);
+				$this->_drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
+			}
+
+			// draw the top border
+			if ($testBt) {
+				$pt = array();
+				$pt[] = $x;                          $pt[] = $y;
+				$pt[] = $x+$border['l']['width'];    $pt[] = $y;
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y;
+				$pt[] = $x+$w;                       $pt[] = $y;
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$border['l']['width'];    $pt[] = $y+$border['t']['width'];
+
+				$bord = 3;
+				if (is_array($outTL)) {
+					$bord-=1;
+					$pt[2] += $outTL[0] - $border['l']['width'];
+					if ($inTL) $pt[10]+= $inTL[0];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($outTR)) {
+					$bord-=2;
+					$pt[4] -= $outTR[0] - $border['r']['width'];
+					if ($inTR) $pt[8] -= $inTR[0];
+					unset($pt[6]);unset($pt[7]);
+				}
+
+				$pt = array_values($pt);
+				$this->_drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
+			}
+
+			// draw the right border
+			if ($testBr) {
+				$pt = array();
+				$pt[] = $x+$w;                       $pt[] = $y;
+				$pt[] = $x+$w;                       $pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$w;                       $pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w;                       $pt[] = $y+$h;
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
+
+				$bord = 3;
+				if (is_array($outTR)) {
+					$bord-=1;
+					$pt[3] += $outTR[1] - $border['t']['width'];
+					if ($inTR) $pt[11]+= $inTR[1];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($outBR)) {
+					$bord-=2;
+					$pt[5] -= $outBR[1] - $border['b']['width'];
+					if ($inBR) $pt[9] -= $inBR[1];
+					unset($pt[6]);unset($pt[7]);
+				}
+
+				$pt = array_values($pt);
+				$this->_drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
+			}
+
+			// draw the bottom border
+			if ($testBb) {
+				$pt = array();
+				$pt[] = $x+$w;                       $pt[] = $y+$h;
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h;
+				$pt[] = $x+$border['l']['width'];    $pt[] = $y+$h;
+				$pt[] = $x;                          $pt[] = $y+$h;
+				$pt[] = $x+$border['l']['width'];    $pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
+
+				$bord = 3;
+				if (is_array($outBL)) {
+					$bord-=2;
+					$pt[4] += $outBL[0] - $border['l']['width'];
+					if ($inBL) $pt[8] += $inBL[0];
+					unset($pt[6]);unset($pt[7]);
+				}
+				if (is_array($outBR)) {
+					$bord-=1;
+					$pt[2] -= $outBR[0] - $border['r']['width'];
+					if ($inBR) $pt[10]-= $inBR[0];
+					unset($pt[0]);unset($pt[1]);
+
+				}
+
+				$pt = array_values($pt);
+				$this->_drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
+			}
+
+			if ($background['color']) {
+				$this->pdf->setFillColorArray($background['color']);
+			}
+
+			return true;
+		}
+
+		/**
+		 * draw a curve (for border radius)
+		 *
+		 * @access protected
+		 * @param  array $pt
+		 * @param  array $color
+		 */
+		protected function _drawCurve($pt, $color)
+		{
+			$this->pdf->setFillColorArray($color);
+
+			if (count($pt)==10)
+				$this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
+			else
+				$this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+		}
+
+		/**
+		 * draw a ligne with a specific type, and specific start and end for radius
+		 *
+		 * @access protected
+		 * @param  array   $pt
+		 * @param  float   $color
+		 * @param  string  $type (dashed, dotted, double, solid)
+		 * @param  float   $width
+		 * @param  integer $radius (binary from 0 to 3 with 1=>start with a radius, 2=>end with a radius)
+		 */
+		protected function _drawLine($pt, $color, $type, $width, $radius=3)
+		{
+			// set the fill color
+			$this->pdf->setFillColorArray($color);
+
+			// if dashed or dotted
+			if ($type=='dashed' || $type=='dotted') {
+
+				// clean the end of the line, if radius
+				if ($radius==1) {
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$this->pdf->Polygon($tmp, 'F');
+
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$pt = $tmp;
+				} else if ($radius==2) {
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
+					$this->pdf->Polygon($tmp, 'F');
+
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$pt = $tmp;
+				} else if ($radius==3) {
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+					$this->pdf->Polygon($tmp, 'F');
+
+					$tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$this->pdf->Polygon($tmp, 'F');
+
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+					$pt = $tmp;
+				}
+
+				// horisontal or vertical line
+				if ($pt[2]==$pt[0]) {
+					$l = abs(($pt[3]-$pt[1])*0.5);
+					$px = 0;
+					$py = $width;
+					$x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
+					$x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
+				} else {
+					$l = abs(($pt[2]-$pt[0])*0.5);
+					$px = $width;
+					$py = 0;
+					$x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
+					$x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
+				}
+
+				// if dashed : 3x bigger than dotted
+				if ($type=='dashed') {
+					$px = $px*3.;
+					$py = $py*3.;
+				}
+				$mode = ($l/($px+$py)<.5);
+
+				// display the dotted/dashed line
+				for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
+					if (($i%2)==$mode) {
+						$j = $i-0.5;
+						$lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
+						$ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
+						$lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
+						$ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
+
+						$tmp = array();
+						$tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
+						$tmp[] = $x1+$lx2; $tmp[] = $y1+$ly2;
+						$tmp[] = $x2+$lx2; $tmp[] = $y2+$ly2;
+						$tmp[] = $x2+$lx1; $tmp[] = $y2+$ly1;
+						$this->pdf->Polygon($tmp, 'F');
+
+						if ($j>0) {
+							$tmp = array();
+							$tmp[] = $x1-$lx1; $tmp[] = $y1-$ly1;
+							$tmp[] = $x1-$lx2; $tmp[] = $y1-$ly2;
+							$tmp[] = $x2-$lx2; $tmp[] = $y2-$ly2;
+							$tmp[] = $x2-$lx1; $tmp[] = $y2-$ly1;
+							$this->pdf->Polygon($tmp, 'F');
+						}
+					}
+				}
+			} else if ($type=='double') {
+
+				// if double, 2 lines : 0=>1/3 and 2/3=>1
+				$pt1 = $pt;
+				$pt2 = $pt;
+
+				if (count($pt)==12) {
+					// line 1
+					$pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
+					$pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
+					$pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
+					$pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
+					$pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
+					$pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
+					$pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
+					$pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
+					$pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
+					$pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
+
+					// line 2
+					$pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
+					$pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
+					$pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
+					$pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
+					$pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
+					$pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
+				} else {
+					// line 1
+					$pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
+					$pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
+					$pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
+					$pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
+
+					// line 2
+					$pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
+					$pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
+					$pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
+					$pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
+				}
+				$this->pdf->Polygon($pt1, 'F');
+				$this->pdf->Polygon($pt2, 'F');
+			} else if ($type=='solid') {
+				// solid line : draw directly the polygon
+				$this->pdf->Polygon($pt, 'F');
+			}
+		}
+
+		/**
+		 * prepare a transform matrix, only for drawing a SVG graphic
+		 *
+		 * @access protected
+		 * @param  string $transform
+		 * @return array  $matrix
+		 */
+		protected function _prepareTransform($transform)
+		{
+			// it can not be  empty
+			if (!$transform) return null;
+
+			// sctions must be like scale(...)
+			if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
+
+			// prepare the list of the actions
+			$actions = array();
+
+			// for actions
+			for ($k=0; $k<count($match[0]); $k++) {
+
+				// get the name of the action
+				$name = strtolower($match[1][$k]);
+
+				// get the parameters of the action
+				$val = explode(',', trim($match[2][$k]));
+				foreach ($val as $i => $j) {
+					$val[$i] = trim($j);
+				}
+
+				// prepare the matrix, depending on the action
+				switch($name)
+				{
+					case 'scale':
+						if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
+						if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
+						$actions[] = array($val[0],0,0,$val[1],0,0);
+						break;
+
+					case 'translate':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
+						$actions[] = array(1,0,0,1,$val[0],$val[1]);
+						break;
+
+					case 'rotate':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
+						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
+						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+						$actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
+						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
+						break;
+
+					case 'skewx':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						$actions[] = array(1,0,tan($val[0]),1,0,0);
+						break;
+
+					case 'skewy':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						$actions[] = array(1,tan($val[0]),0,1,0,0);
+						break;
+					case 'matrix':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
+						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
+						if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
+						if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
+						if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
+						$actions[] =$val;
+						break;
+				}
+			}
+
+			// if ther is no actions => return
+			if (!$actions) return null;
+
+			// get the first matrix
+			$m = $actions[0]; unset($actions[0]);
+
+			// foreach matrix => multiply to the last matrix
+			foreach ($actions as $n) {
+				$m = array(
+					$m[0]*$n[0]+$m[2]*$n[1],
+					$m[1]*$n[0]+$m[3]*$n[1],
+					$m[0]*$n[2]+$m[2]*$n[3],
+					$m[1]*$n[2]+$m[3]*$n[3],
+					$m[0]*$n[4]+$m[2]*$n[5]+$m[4],
+					$m[1]*$n[4]+$m[3]*$n[5]+$m[5]
+				);
+			}
+
+			// return the matrix
+			return $m;
+		}
+
+		/**
+		 * @access protected
+		 * @param  &array $cases
+		 * @param  &array $corr
+		 */
+		protected function _calculateTableCellSize(&$cases, &$corr)
+		{
+			if (!isset($corr[0])) return true;
+
+			// for each cell without colspan, we get the max width for each column
+			$sw = array();
+			for ($x=0; $x<count($corr[0]); $x++) {
+				$m=0;
+				for ($y=0; $y<count($corr); $y++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1) {
+						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);
+					}
+				}
+				$sw[$x] = $m;
+			}
+
+			// for each cell with colspan, we adapt the width of each column
+			for ($x=0; $x<count($corr[0]); $x++) {
+				for ($y=0; $y<count($corr); $y++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
+
+						// sum the max width of each column in colspan
+						$s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+
+						// if the max width is < the width of the cell with colspan => we adapt the width of each max width
+						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
+							for ($i=0; $i<$corr[$y][$x][2]; $i++) {
+								$sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+							}
+						}
+					}
+				}
+			}
+
+			// set the new width, for each cell
+			for ($x=0; $x<count($corr[0]); $x++) {
+				for ($y=0; $y<count($corr); $y++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
+						// without colspan
+						if ($corr[$y][$x][2]==1) {
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
+						// with colspan
+						} else {
+							$s = 0;
+							for ($i=0; $i<$corr[$y][$x][2]; $i++) {
+								$s+= $sw[$x+$i];
+							}
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
+						}
+					}
+				}
+			}
+
+			// for each cell without rowspan, we get the max height for each line
+			$sh = array();
+			for ($y=0; $y<count($corr); $y++) {
+				$m=0;
+				for ($x=0; $x<count($corr[0]); $x++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1) {
+						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
+					}
+				}
+				$sh[$y] = $m;
+			}
+
+			// for each cell with rowspan, we adapt the height of each line
+			for ($y=0; $y<count($corr); $y++) {
+				for ($x=0; $x<count($corr[0]); $x++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
+
+						// sum the max height of each line in rowspan
+						$s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+
+						// if the max height is < the height of the cell with rowspan => we adapt the height of each max height
+						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
+							for ($i=0; $i<$corr[$y][$x][3]; $i++) {
+								$sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
+							}
+						}
+					}
+				}
+			}
+
+			// set the new height, for each cell
+			for ($y=0; $y<count($corr); $y++) {
+				for ($x=0; $x<count($corr[0]); $x++) {
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
+						// without rowspan
+						if ($corr[$y][$x][3]==1) {
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
+						// with rowspan
+						} else {
+							$s = 0;
+							for ($i=0; $i<$corr[$y][$x][3]; $i++) {
+								$s+= $sh[$y+$i];
+							}
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
+
+							for ($j=1; $j<$corr[$y][$x][3]; $j++) {
+								$tx = $x+1;
+								$ty = $y+$j;
+								for (true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
+								if (isset($corr[$ty][$tx])) {
+									$cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		/**
+		 * tag : PAGE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PAGE($param)
+		{
+			if ($this->_isForOneLine) return false;
+			if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
+
+			$newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
+
+			$resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup']=='new');
+
+			$this->_maxH = 0;
+
+			// if new page set asked
+			if ($newPageSet) {
+				$this->_subHEADER = array();
+				$this->_subFOOTER = array();
+
+				// orientation
+				$orientation = '';
+				if (isset($param['orientation'])) {
+					$param['orientation'] = strtolower($param['orientation']);
+					if ($param['orientation']=='p')         $orientation = 'P';
+					if ($param['orientation']=='portrait')  $orientation = 'P';
+
+					if ($param['orientation']=='l')         $orientation = 'L';
+					if ($param['orientation']=='paysage')   $orientation = 'L';
+					if ($param['orientation']=='landscape') $orientation = 'L';
+				}
+
+				// format
+				$format = null;
+				if (isset($param['format'])) {
+					$format = strtolower($param['format']);
+					if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match)) {
+						$format = array(intval($match[1]), intval($match[2]));
+					}
+				}
+
+				// background
+				$background = array();
+				if (isset($param['backimg'])) {
+					$background['img']    = isset($param['backimg'])  ? $param['backimg']  : '';       // src of the image
+					$background['posX']   = isset($param['backimgx']) ? $param['backimgx'] : 'center'; // horizontale position of the image
+					$background['posY']   = isset($param['backimgy']) ? $param['backimgy'] : 'middle'; // vertical position of the image
+					$background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%';   // width of the image (100% = page width)
+
+					// convert the src of the image, if parameters
+					$background['img'] = str_replace('&amp;', '&', $background['img']);
+
+					// convert the positions
+					if ($background['posX']=='left')    $background['posX'] = '0%';
+					if ($background['posX']=='center')  $background['posX'] = '50%';
+					if ($background['posX']=='right')   $background['posX'] = '100%';
+					if ($background['posY']=='top')     $background['posY'] = '0%';
+					if ($background['posY']=='middle')  $background['posY'] = '50%';
+					if ($background['posY']=='bottom')  $background['posY'] = '100%';
+
+					if ($background['img']) {
+						// get the size of the image
+						// WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
+						$infos=@getimagesize($background['img']);
+						if (count($infos)>1) {
+							$imageWidth = $this->parsingCss->ConvertToMM($background['width'], $this->pdf->getW());
+							$imageHeight = $imageWidth*$infos[1]/$infos[0];
+
+							$background['width'] = $imageWidth;
+							$background['posX']  = $this->parsingCss->ConvertToMM($background['posX'], $this->pdf->getW() - $imageWidth);
+							$background['posY']  = $this->parsingCss->ConvertToMM($background['posY'], $this->pdf->getH() - $imageHeight);
+						} else {
+							$background = array();
+						}
+					} else {
+						$background = array();
+					}
+				}
+
+				// margins of the page
+				$background['top']    = isset($param['backtop'])    ? $param['backtop']    : '0';
+				$background['bottom'] = isset($param['backbottom']) ? $param['backbottom'] : '0';
+				$background['left']   = isset($param['backleft'])   ? $param['backleft']   : '0';
+				$background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
+
+				// if no unit => mm
+				if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) $background['bottom'] .= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['left']))   $background['left']   .= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['right']))  $background['right']  .= 'mm';
+
+				// convert to mm
+				$background['top']    = $this->parsingCss->ConvertToMM($background['top'], $this->pdf->getH());
+				$background['bottom'] = $this->parsingCss->ConvertToMM($background['bottom'], $this->pdf->getH());
+				$background['left']   = $this->parsingCss->ConvertToMM($background['left'], $this->pdf->getW());
+				$background['right']  = $this->parsingCss->ConvertToMM($background['right'], $this->pdf->getW());
+
+				// get the background color
+				$res = false;
+				$background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
+				if (!$res) $background['color'] = null;
+
+				$this->parsingCss->save();
+				$this->parsingCss->analyse('PAGE', $param);
+				$this->parsingCss->setPosition();
+				$this->parsingCss->fontSet();
+
+				// new page
+				$this->_setNewPage($format, $orientation, $background, null, $resetPageNumber);
+
+				// automatic footer
+				if (isset($param['footer'])) {
+					$lst = explode(';', $param['footer']);
+					foreach ($lst as $key => $val) $lst[$key] = trim(strtolower($val));
+					$page    = in_array('page', $lst);
+					$date    = in_array('date', $lst);
+					$hour    = in_array('heure', $lst);
+					$form    = in_array('form', $lst);
+				} else {
+					$page    = null;
+					$date    = null;
+					$hour    = null;
+					$form    = null;
+				}
+				$this->pdf->SetMyFooter($page, $date, $hour, $form);
+			// else => we use the last page set used
+			} else {
+				$this->parsingCss->save();
+				$this->parsingCss->analyse('PAGE', $param);
+				$this->parsingCss->setPosition();
+				$this->parsingCss->fontSet();
+
+				$this->_setNewPage(null, null, null, null, $resetPageNumber);
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : PAGE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_PAGE($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
+
+			return true;
+		}
+
+		/**
+		 * tag : PAGE_HEADER
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PAGE_HEADER($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_subHEADER = array();
+			for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+				$action = $this->parsingHtml->code[$this->_parsePos];
+				if ($action['name']=='page_header') $action['name']='page_header_sub';
+				$this->_subHEADER[] = $action;
+				if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
+			}
+
+			$this->_setPageHeader();
+
+			return true;
+		}
+
+		/**
+		 * tag : PAGE_FOOTER
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PAGE_FOOTER($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_subFOOTER = array();
+			for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+				$action = $this->parsingHtml->code[$this->_parsePos];
+				if ($action['name']=='page_footer') $action['name']='page_footer_sub';
+				$this->_subFOOTER[] = $action;
+				if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
+			}
+
+			$this->_setPageFooter();
+
+			return true;
+		}
+
+		/**
+		 * It is not a real tag. Does not use it directly
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PAGE_HEADER_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			// save the current stat
+			$this->_subSTATES = array();
+			$this->_subSTATES['x']  = $this->pdf->getX();
+			$this->_subSTATES['y']  = $this->pdf->getY();
+			$this->_subSTATES['s']  = $this->parsingCss->value;
+			$this->_subSTATES['t']  = $this->parsingCss->table;
+			$this->_subSTATES['ml'] = $this->_margeLeft;
+			$this->_subSTATES['mr'] = $this->_margeRight;
+			$this->_subSTATES['mt'] = $this->_margeTop;
+			$this->_subSTATES['mb'] = $this->_margeBottom;
+			$this->_subSTATES['mp'] = $this->_pageMarges;
+
+			// new stat for the header
+			$this->_pageMarges = array();
+			$this->_margeLeft    = $this->_defaultLeft;
+			$this->_margeRight   = $this->_defaultRight;
+			$this->_margeTop     = $this->_defaultTop;
+			$this->_margeBottom  = $this->_defaultBottom;
+			$this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
+			$this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
+
+			$this->parsingCss->initStyle();
+			$this->parsingCss->resetStyle();
+			$this->parsingCss->value['width'] = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
+			$this->parsingCss->table = array();
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('page_header_sub', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			$this->_setNewPositionForNewLine();
+			return true;
+		}
+
+		/**
+		 * It is not a real tag. Does not use it directly
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_PAGE_HEADER_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+
+			// restore the stat
+			$this->parsingCss->value = $this->_subSTATES['s'];
+			$this->parsingCss->table = $this->_subSTATES['t'];
+			$this->_pageMarges       = $this->_subSTATES['mp'];
+			$this->_margeLeft        = $this->_subSTATES['ml'];
+			$this->_margeRight       = $this->_subSTATES['mr'];
+			$this->_margeTop         = $this->_subSTATES['mt'];
+			$this->_margeBottom      = $this->_subSTATES['mb'];
+			$this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
+			$this->pdf->setbMargin($this->_margeBottom);
+			$this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
+			$this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
+
+			$this->parsingCss->fontSet();
+			$this->_maxH = 0;
+
+			return true;
+		}
+
+		/**
+		 * It is not a real tag. Does not use it directly
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PAGE_FOOTER_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			// save the current stat
+			$this->_subSTATES = array();
+			$this->_subSTATES['x']    = $this->pdf->getX();
+			$this->_subSTATES['y']    = $this->pdf->getY();
+			$this->_subSTATES['s']    = $this->parsingCss->value;
+			$this->_subSTATES['t']    = $this->parsingCss->table;
+			$this->_subSTATES['ml']    = $this->_margeLeft;
+			$this->_subSTATES['mr']    = $this->_margeRight;
+			$this->_subSTATES['mt']    = $this->_margeTop;
+			$this->_subSTATES['mb']    = $this->_margeBottom;
+			$this->_subSTATES['mp']    = $this->_pageMarges;
+
+			// new stat for the footer
+			$this->_pageMarges  = array();
+			$this->_margeLeft   = $this->_defaultLeft;
+			$this->_margeRight  = $this->_defaultRight;
+			$this->_margeTop    = $this->_defaultTop;
+			$this->_margeBottom = $this->_defaultBottom;
+			$this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
+			$this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
+
+			$this->parsingCss->initStyle();
+			$this->parsingCss->resetStyle();
+			$this->parsingCss->value['width']    = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
+			$this->parsingCss->table                = array();
+
+			// we create a sub HTML2PFDF, and we execute on it the content of the footer, to get the height of it
+			$sub = null;
+			$this->_createSubHTML($sub);
+			$sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
+			$sub->_makeHTMLcode();
+			$this->pdf->setY($this->pdf->getH() - $sub->_maxY - $this->_defaultBottom - 0.01);
+			$this->_destroySubHTML($sub);
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('page_footer_sub', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			$this->_setNewPositionForNewLine();
+
+			return true;
+		}
+
+		/**
+		 * It is not a real tag. Does not use it directly
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_PAGE_FOOTER_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+
+			$this->parsingCss->value                = $this->_subSTATES['s'];
+			$this->parsingCss->table                = $this->_subSTATES['t'];
+			$this->_pageMarges                 = $this->_subSTATES['mp'];
+			$this->_margeLeft                = $this->_subSTATES['ml'];
+			$this->_margeRight                = $this->_subSTATES['mr'];
+			$this->_margeTop                    = $this->_subSTATES['mt'];
+			$this->_margeBottom                = $this->_subSTATES['mb'];
+			$this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
+			$this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
+
+			$this->parsingCss->fontSet();
+			$this->_maxH = 0;
+
+			return true;
+		}
+
+		/**
+		 * tag : NOBREAK
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_NOBREAK($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			// create a sub HTML2PDF to execute the content of the tag, to get the dimensions
+			$sub = null;
+			$this->_createSubHTML($sub);
+			$sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
+			$sub->_makeHTMLcode();
+			$y = $this->pdf->getY();
+
+			// if the content does not fit on the page => new page
+			if (
+				$sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
+				$y + $sub->_maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
+			) {
+				$this->_setNewPage();
+			}
+
+			// destroy the sub HTML2PDF
+			$this->_destroySubHTML($sub);
+
+			return true;
+		}
+
+
+		/**
+		 * tag : NOBREAK
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_NOBREAK($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			return true;
+		}
+
+		/**
+		 * tag : DIV
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other name of tag that used the div tag
+		 * @return boolean
+		 */
+		protected function _tag_open_DIV($param, $other = 'div')
+		{
+			if ($this->_isForOneLine) return false;
+			if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), true);
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->fontSet();
+
+			// for fieldset and legend
+			if (in_array($other, array('fieldset', 'legend'))) {
+				if (isset($param['moveTop']))  $this->parsingCss->value['margin']['t']    += $param['moveTop'];
+				if (isset($param['moveLeft'])) $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
+				if (isset($param['moveDown'])) $this->parsingCss->value['margin']['b']    += $param['moveDown'];
+			}
+
+			$alignObject = null;
+			if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+
+			$marge = array();
+			$marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
+			$marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
+			$marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
+			$marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+
+			// extract the content of the div
+			$level = $this->parsingHtml->getLevel($this->_parsePos);
+
+			// create a sub HTML2PDF to get the dimensions of the content of the div
+			$w = 0; $h = 0;
+			if (count($level)) {
+				$sub = null;
+				$this->_createSubHTML($sub);
+				$sub->parsingHtml->code = $level;
+				$sub->_makeHTMLcode();
+				$w = $sub->_maxX;
+				$h = $sub->_maxY;
+				$this->_destroySubHTML($sub);
+			}
+			$wReel = $w;
+			$hReel = $h;
+
+			$w+= $marge['l']+$marge['r']+0.001;
+			$h+= $marge['t']+$marge['b']+0.001;
+
+			if ($this->parsingCss->value['overflow']=='hidden') {
+				$overW = max($w, $this->parsingCss->value['width']);
+				$overH = max($h, $this->parsingCss->value['height']);
+				$overflow = true;
+				$this->parsingCss->value['old_maxX'] = $this->_maxX;
+				$this->parsingCss->value['old_maxY'] = $this->_maxY;
+				$this->parsingCss->value['old_maxH'] = $this->_maxH;
+				$this->parsingCss->value['old_overflow'] = $this->_isInOverflow;
+				$this->_isInOverflow = true;
+			} else {
+				$overW = null;
+				$overH = null;
+				$overflow = false;
+				$this->parsingCss->value['width']    = max($w, $this->parsingCss->value['width']);
+				$this->parsingCss->value['height']    = max($h, $this->parsingCss->value['height']);
+			}
+
+			switch($this->parsingCss->value['rotate'])
+			{
+				case 90:
+					$tmp = $overH; $overH = $overW; $overW = $tmp;
+					$tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
+					unset($tmp);
+					$w = $this->parsingCss->value['height'];
+					$h = $this->parsingCss->value['width'];
+					$tX =-$h;
+					$tY = 0;
+					break;
+
+				case 180:
+					$w = $this->parsingCss->value['width'];
+					$h = $this->parsingCss->value['height'];
+					$tX = -$w;
+					$tY = -$h;
+					break;
+
+				case 270:
+					$tmp = $overH; $overH = $overW; $overW = $tmp;
+					$tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
+					unset($tmp);
+					$w = $this->parsingCss->value['height'];
+					$h = $this->parsingCss->value['width'];
+					$tX = 0;
+					$tY =-$w;
+					break;
+
+				default:
+					$w = $this->parsingCss->value['width'];
+					$h = $this->parsingCss->value['height'];
+					$tX = 0;
+					$tY = 0;
+					break;
+			}
+
+			if (!$this->parsingCss->value['position']) {
+				if (
+					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
+					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+					)
+					$this->_tag_open_BR(array());
+
+				if (
+						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
+						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
+						!$this->_isInOverflow
+					)
+					$this->_setNewPage();
+
+				$old = $this->parsingCss->getOldValues();
+				$parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+
+				if ($parentWidth>$w) {
+					if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+					else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+				}
+
+				$this->parsingCss->setPosition();
+			} else {
+				$old = $this->parsingCss->getOldValues();
+				$parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+
+				if ($parentWidth>$w) {
+					if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+					else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+				}
+
+				$this->parsingCss->setPosition();
+				$this->_saveMax();
+				$this->_maxX = 0;
+				$this->_maxY = 0;
+				$this->_maxH = 0;
+				$this->_maxE = 0;
+			}
+
+			if ($this->parsingCss->value['rotate']) {
+				$this->pdf->startTransform();
+				$this->pdf->setRotation($this->parsingCss->value['rotate']);
+				$this->pdf->setTranslate($tX, $tY);
+			}
+
+			$this->_drawRectangle(
+				$this->parsingCss->value['x'],
+				$this->parsingCss->value['y'],
+				$this->parsingCss->value['width'],
+				$this->parsingCss->value['height'],
+				$this->parsingCss->value['border'],
+				$this->parsingCss->value['padding'],
+				0,
+				$this->parsingCss->value['background']
+			);
+
+			$marge = array();
+			$marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
+			$marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
+			$marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
+			$marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+
+			$this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
+			$this->parsingCss->value['height']-= $marge['t']+$marge['b'];
+
+			$xCorr = 0;
+			$yCorr = 0;
+			if (!$this->_subPart && !$this->_isSubPart) {
+				switch($this->parsingCss->value['text-align'])
+				{
+					case 'right':
+						$xCorr = ($this->parsingCss->value['width']-$wReel);
+						break;
+					case 'center':
+						$xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
+						break;
+				}
+				if ($xCorr>0) $xCorr=0;
+				switch($this->parsingCss->value['vertical-align'])
+				{
+					case 'bottom':
+						$yCorr = ($this->parsingCss->value['height']-$hReel);
+						break;
+					case 'middle':
+						$yCorr = ($this->parsingCss->value['height']-$hReel)*0.5;
+						break;
+				}
+			}
+
+			if ($overflow) {
+				$overW-= $marge['l']+$marge['r'];
+				$overH-= $marge['t']+$marge['b'];
+				$this->pdf->clippingPathStart(
+					$this->parsingCss->value['x']+$marge['l'],
+					$this->parsingCss->value['y']+$marge['t'],
+					$this->parsingCss->value['width'],
+					$this->parsingCss->value['height']
+				);
+
+				$this->parsingCss->value['x']+= $xCorr;
+
+				// marges from the dimension of the content
+				$mL = $this->parsingCss->value['x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $overW;
+			} else {
+				// marges from the dimension of the div
+				$mL = $this->parsingCss->value['x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
+			}
+
+			$x = $this->parsingCss->value['x']+$marge['l'];
+			$y = $this->parsingCss->value['y']+$marge['t']+$yCorr;
+			$this->_saveMargin($mL, 0, $mR);
+			$this->pdf->setXY($x, $y);
+
+			$this->_setNewPositionForNewLine();
+
+			return true;
+		}
+
+		/**
+		 * tag : BLOCKQUOTE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_BLOCKQUOTE($param)
+		{
+			return $this->_tag_open_DIV($param, 'blockquote');
+		}
+
+		/**
+		 * tag : LEGEND
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_LEGEND($param)
+		{
+			return $this->_tag_open_DIV($param, 'legend');
+		}
+
+		/**
+		 * tag : FIELDSET
+		 * mode : OPEN
+		 *
+		 * @author Pavel Kochman
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_FIELDSET($param)
+		{
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('fieldset', $param);
+
+			// get height of LEGEND element and make fieldset corrections
+			for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
+				$action = $this->parsingHtml->code[$tempPos];
+				if ($action['name'] == 'fieldset') break;
+				if ($action['name'] == 'legend' && !$action['close']) {
+					$legendOpenPos = $tempPos;
+
+					$sub = null;
+					$this->_createSubHTML($sub);
+					$sub->parsingHtml->code = $this->parsingHtml->getLevel($tempPos - 1);
+
+					$res = null;
+					for ($sub->_parsePos = 0; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
+						$action = $sub->parsingHtml->code[$sub->_parsePos];
+						$sub->_executeAction($action);
+
+						if ($action['name'] == 'legend' && $action['close'])
+							break;
+					}
+
+					$legendH = $sub->_maxY;
+					$this->_destroySubHTML($sub);
+
+					$move = $this->parsingCss->value['padding']['t'] + $this->parsingCss->value['border']['t']['width'] + 0.03;
+
+					$param['moveTop'] = $legendH / 2;
+
+					$this->parsingHtml->code[$legendOpenPos]['param']['moveTop'] = - ($legendH / 2 + $move);
+					$this->parsingHtml->code[$legendOpenPos]['param']['moveLeft'] = 2 - $this->parsingCss->value['border']['l']['width'] - $this->parsingCss->value['padding']['l'];
+					$this->parsingHtml->code[$legendOpenPos]['param']['moveDown'] = $move;
+					break;
+				}
+			}
+			$this->parsingCss->load();
+
+			return $this->_tag_open_DIV($param, 'fieldset');
+		}
+
+		/**
+		 * tag : DIV
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @param  string $other name of tag that used the div tag
+		 * @return boolean
+		 */
+		protected function _tag_close_DIV($param, $other='div')
+		{
+			if ($this->_isForOneLine) return false;
+
+			if ($this->parsingCss->value['overflow']=='hidden') {
+				$this->_maxX = $this->parsingCss->value['old_maxX'];
+				$this->_maxY = $this->parsingCss->value['old_maxY'];
+				$this->_maxH = $this->parsingCss->value['old_maxH'];
+				$this->_isInOverflow = $this->parsingCss->value['old_overflow'];
+				$this->pdf->clippingPathStop();
+			}
+
+			if ($this->parsingCss->value['rotate'])
+				$this->pdf->stopTransform();
+
+			$marge = array();
+			$marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
+			$marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
+			$marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
+			$marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+
+			$x = $this->parsingCss->value['x'];
+			$y = $this->parsingCss->value['y'];
+			$w = $this->parsingCss->value['width']+$marge['l']+$marge['r']+$this->parsingCss->value['margin']['r'];
+			$h = $this->parsingCss->value['height']+$marge['t']+$marge['b']+$this->parsingCss->value['margin']['b'];
+
+			switch($this->parsingCss->value['rotate'])
+			{
+				case 90:
+					$t = $w; $w = $h; $h = $t;
+					break;
+
+				case 270:
+					$t = $w; $w = $h; $h = $t;
+					break;
+
+				default:
+					break;
+			}
+
+
+			if ($this->parsingCss->value['position']!='absolute') {
+				$this->pdf->setXY($x+$w, $y);
+
+				$this->_maxX = max($this->_maxX, $x+$w);
+				$this->_maxY = max($this->_maxY, $y+$h);
+				$this->_maxH = max($this->_maxH, $h);
+			} else {
+				$this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
+
+				$this->_loadMax();
+			}
+
+			$block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+			$this->_loadMargin();
+
+			if ($block) $this->_tag_open_BR(array());
+			if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), false);
+
+			return true;
+		}
+
+		/**
+		 * tag : BLOCKQUOTE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_BLOCKQUOTE($param)
+		{
+			return $this->_tag_close_DIV($param, 'blockquote');
+		}
+
+		/**
+		 * tag : FIELDSET
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_FIELDSET($param)
+		{
+			return $this->_tag_close_DIV($param, 'fieldset');
+		}
+
+		/**
+		 * tag : LEGEND
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_LEGEND($param)
+		{
+			return $this->_tag_close_DIV($param, 'legend');
+		}
+
+		/**
+		 * tag : BARCODE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_BARCODE($param)
+		{
+			// for  compatibility with old versions < 3.29
+			$lstBarcode = array();
+			$lstBarcode['UPC_A']  =    'UPCA';
+			$lstBarcode['CODE39'] =    'C39';
+
+			if (!isset($param['type']))     $param['type'] = 'C39';
+			if (!isset($param['value']))    $param['value']    = 0;
+			if (!isset($param['label']))    $param['label']    = 'label';
+			if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
+
+			if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
+				throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
+
+			$param['type'] = strtoupper($param['type']);
+			if (isset($lstBarcode[$param['type']])) $param['type'] = $lstBarcode[$param['type']];
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('barcode', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
+			$h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
+			$txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
+			$c = $this->parsingCss->value['color'];
+			$infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
+
+			$this->_maxX = max($this->_maxX, $x+$infos[0]);
+			$this->_maxY = max($this->_maxY, $y+$infos[1]);
+			$this->_maxH = max($this->_maxH, $infos[1]);
+			$this->_maxE++;
+
+			$this->pdf->setXY($x+$infos[0], $y);
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : BARCODE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_BARCODE($param)
+		{
+			// there is nothing to do here
+
+			return true;
+		}
+
+		/**
+		 * tag : QRCODE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_QRCODE($param)
+		{
+			if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
+				throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
+
+			if ($this->_debugActif) $this->_DEBUG_add('QRCODE');
+
+			if (!isset($param['value']))                     $param['value'] = '';
+			if (!isset($param['ec']))                        $param['ec'] = 'H';
+			if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
+			if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
+			if (isset($param['style']['border'])) {
+				$borders = $param['style']['border']!='none';
+				unset($param['style']['border']);
+			} else {
+				$borders = true;
+			}
+
+			if ($param['value']==='') return true;
+			if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('qrcode', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$w = $this->parsingCss->value['width'];
+			$h = $this->parsingCss->value['height'];
+			$size = max($w, $h); if (!$size) $size = $this->parsingCss->ConvertToMM('50mm');
+
+			$style = array(
+					'fgcolor' => $this->parsingCss->value['color'],
+					'bgcolor' => $this->parsingCss->value['background']['color'],
+				);
+
+			if ($borders) {
+				$style['border'] = true;
+				$style['padding'] = 'auto';
+			} else {
+				$style['border'] = false;
+				$style['padding'] = 0;
+			}
+
+			if (!$this->_subPart && !$this->_isSubPart) {
+				$this->pdf->write2DBarcode($param['value'], 'QRCODE,'.$param['ec'], $x, $y, $size, $size, $style);
+			}
+
+			$this->_maxX = max($this->_maxX, $x+$size);
+			$this->_maxY = max($this->_maxY, $y+$size);
+			$this->_maxH = max($this->_maxH, $size);
+			$this->_maxE++;
+
+			$this->pdf->setX($x+$size);
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : QRCODE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_QRCODE($param)
+		{
+			// there is nothing to do here
+
+			return true;
+		}
+
+		/**
+		 * tag : BOOKMARK
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_BOOKMARK($param)
+		{
+			$titre = isset($param['title']) ? trim($param['title']) : '';
+			$level = isset($param['level']) ? floor($param['level']) : 0;
+
+			if ($level<0) $level = 0;
+			if ($titre) $this->pdf->Bookmark($titre, $level, -1);
+
+			return true;
+		}
+
+		/**
+		 * tag : BOOKMARK
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_BOOKMARK($param)
+		{
+			// there is nothing to do here
+
+			return true;
+		}
+
+		/**
+		 * this is not a real TAG, it is just to write texts
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_WRITE($param)
+		{
+			$fill = ($this->parsingCss->value['background']['color']!==null && $this->parsingCss->value['background']['image']===null);
+			if (in_array($this->parsingCss->value['id_tag'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th'))) {
+				$fill = false;
+			}
+
+			// get the text to write
+			$txt = $param['txt'];
+
+			if ($this->_isAfterFloat) {
+				$txt = ltrim($txt);
+				$this->_isAfterFloat = false;
+			}
+
+			$txt = str_replace('[[page_nb]]', $this->pdf->getMyAliasNbPages(), $txt);
+			$txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
+
+			if ($this->parsingCss->value['text-transform']!='none') {
+				if ($this->parsingCss->value['text-transform']=='capitalize')
+					$txt = ucwords($txt);
+				else if ($this->parsingCss->value['text-transform']=='uppercase')
+					$txt = strtoupper($txt);
+				else if ($this->parsingCss->value['text-transform']=='lowercase')
+					$txt = strtolower($txt);
+			}
+
+			// size of the text
+			$h  = 1.08*$this->parsingCss->value['font-size'];
+			$dh = $h*$this->parsingCss->value['mini-decal'];
+			$lh = $this->parsingCss->getLineHeight();
+
+			// identify the align
+			$align = 'L';
+			if ($this->parsingCss->value['text-align']=='li_right') {
+				$w = $this->parsingCss->value['width'];
+				$align = 'R';
+			}
+
+			// calculate the width of each words, and of all the sentence
+			$w = 0;
+			$words = explode(' ', $txt);
+			foreach ($words as $k => $word) {
+				$words[$k] = array($word, $this->pdf->GetStringWidth($word));
+				$w+= $words[$k][1];
+			}
+			$space = $this->pdf->GetStringWidth(' ');
+			$w+= $space*(count($words)-1);
+
+			// position in the text
+			$currPos = 0;
+
+			// the bigger width of the text, after automatic break line
+			$maxX = 0;
+
+			// position of the text
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$dy = $this->_getElementY($lh);
+
+			// margins
+			list($left, $right) = $this->_getMargins($y);
+
+			// number of lines after automatic break line
+			$nb = 0;
+
+			// while we have words, and the text does not fit on the line => we cut the sentence
+			while ($x+$w>$right && $x<$right+$space && count($words)) {
+				// adding words 1 by 1 to fit on the line
+				$i=0;
+				$old = array('', 0);
+				$str = $words[0];
+				$add = false;
+				while (($x+$str[1])<$right) {
+					$i++;
+					$add = true;
+
+					array_shift($words);
+					$old = $str;
+
+					if (!count($words)) break;
+					$str[0].= ' '.$words[0][0];
+					$str[1]+= $space+$words[0][1];
+				}
+				$str = $old;
+
+				// if  nothing fit on the line, and if the first word does not fit on the line => the word is too long, we put it
+				if ($i==0 && (($left+$words[0][1])>=$right)) {
+					$str = $words[0];
+					array_shift($words);
+					$i++;
+					$add = true;
+				}
+				$currPos+= ($currPos ? 1 : 0)+strlen($str[0]);
+
+				// write the extract sentence that fit on the page
+				$wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
+				if ($right - $left<$wc) $wc = $right - $left;
+
+				if (strlen($str[0])) {
+					$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
+					$this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->_isInLink);
+					$this->pdf->setXY($this->pdf->getX(), $y);
+				}
+				$this->_maxH = max($this->_maxH, $lh);
+
+				// max width
+				$maxX = max($maxX, $this->pdf->getX());
+
+				// new position and new width for the "while"
+				$w-= $str[1];
+				$y = $this->pdf->getY();
+				$x = $this->pdf->getX();
+				$dy = $this->_getElementY($lh);
+
+				// if we have again words to write
+				if (count($words)) {
+					// remove the space at the end
+					if ($add) $w-= $space;
+
+					// if we don't add any word, and if the first word is empty => useless space to skip
+					if (!$add && $words[0][0]==='') {
+						array_shift($words);
+					}
+
+					// if it is just to calculate for one line => adding the number of words
+					if ($this->_isForOneLine) {
+						$this->_maxE+= $i;
+						$this->_maxX = max($this->_maxX, $maxX);
+						return null;
+					}
+
+					// automatic line break
+					$this->_tag_open_BR(array('style' => ''), $currPos);
+
+					// new position
+					$y = $this->pdf->getY();
+					$x = $this->pdf->getX();
+					$dy = $this->_getElementY($lh);
+
+					// if the next line does  not fit on the page => new page
+					if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin()) {
+						if (!$this->_isInOverflow && !$this->_isInFooter) {
+							$this->_setNewPage(null, '', null, $currPos);
+							$y = $this->pdf->getY();
+							$x = $this->pdf->getX();
+							$dy = $this->_getElementY($lh);
+						}
+					}
+
+					// if more than 10000 line => error
+					$nb++;
+					if ($nb>10000) {
+						$txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+						throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
+					}
+
+					// new margins for the new line
+					list($left, $right) = $this->_getMargins($y);
+				}
+			}
+
+			// if we have words after automatic cut, it is because they fit on the line => we write the text
+			if (count($words)) {
+				$txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+				$w+= $this->pdf->getWordSpacing()*(count($words));
+				$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
+				$this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
+				$this->pdf->setXY($this->pdf->getX(), $y);
+				$this->_maxH = max($this->_maxH, $lh);
+				$this->_maxE+= count($words);
+			}
+
+			$maxX = max($maxX, $this->pdf->getX());
+			$maxY = $this->pdf->getY()+$h;
+
+			$this->_maxX = max($this->_maxX, $maxX);
+			$this->_maxY = max($this->_maxY, $maxY);
+
+			return true;
+		}
+
+		/**
+		 * tag : BR
+		 * mode : OPEN
+		 *
+		 * @param  array   $param
+		 * @param  integer $curr real position in the html parseur (if break line in the write of a text)
+		 * @return boolean
+		 */
+		protected function _tag_open_BR($param, $curr = null)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$h = max($this->_maxH, $this->parsingCss->getLineHeight());
+
+			if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+
+			$this->_makeBreakLine($h, $curr);
+
+			$this->_maxH = 0;
+			$this->_maxE = 0;
+
+			return true;
+		}
+
+		/**
+		 * tag : HR
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_HR($param)
+		{
+			if ($this->_isForOneLine) return false;
+			$oldAlign = $this->parsingCss->value['text-align'];
+			$this->parsingCss->value['text-align'] = 'left';
+
+			if ($this->_maxH) $this->_tag_open_BR($param);
+
+			$fontSize = $this->parsingCss->value['font-size'];
+			$this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
+			$this->parsingCss->value['font-size']=0;
+
+			$param['style']['width'] = '100%';
+
+			$this->parsingCss->save();
+			$this->parsingCss->value['height']=$this->parsingCss->ConvertToMM('1mm');
+
+			$this->parsingCss->analyse('hr', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$h = $this->parsingCss->value['height'];
+			if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+			if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+
+			$this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
+			$this->_maxH = $h;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			$this->_tag_open_BR($param);
+
+			$this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
+			$this->parsingCss->value['font-size']=$fontSize;
+
+			$this->parsingCss->value['text-align'] = $oldAlign;
+			$this->_setNewPositionForNewLine();
+
+			return true;
+		}
+
+		/**
+		 * tag : B
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_B($param, $other = 'b')
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-bold'] = true;
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : STRONG
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_STRONG($param)
+		{
+			return $this->_tag_open_B($param, 'strong');
+		}
+
+		/**
+		 * tag : B
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_B($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : STRONG
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_STRONG($param)
+		{
+			return $this->_tag_close_B($param);
+		}
+
+		/**
+		 * tag : I
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_I($param, $other = 'i')
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-italic'] = true;
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : ADDRESS
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_ADDRESS($param)
+		{
+			return $this->_tag_open_I($param, 'address');
+		}
+
+		/**
+		 * tag : CITE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_CITE($param)
+		{
+			return $this->_tag_open_I($param, 'cite');
+		}
+
+		/**
+		 * tag : EM
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_EM($param)
+		{
+			return $this->_tag_open_I($param, 'em');
+		}
+
+		/**
+		 * tag : SAMP
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_SAMP($param)
+		{
+			return $this->_tag_open_I($param, 'samp');
+		}
+
+		/**
+		 * tag : I
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_I($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : ADDRESS
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_ADDRESS($param)
+		{
+			return $this->_tag_close_I($param);
+		}
+
+		/**
+		 * tag : CITE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_CITE($param)
+		{
+			return $this->_tag_close_I($param);
+		}
+
+		/**
+		 * tag : EM
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_EM($param)
+		{
+			return $this->_tag_close_I($param);
+		}
+
+		/**
+		 * tag : SAMP
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SAMP($param)
+		{
+			return $this->_tag_close_I($param);
+		}
+
+		/**
+		 * tag : S
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_S($param, $other = 's')
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-linethrough'] = true;
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : DEL
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_DEL($param)
+		{
+			return $this->_tag_open_S($param, 'del');
+		}
+
+		/**
+		 * tag : S
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_S($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : DEL
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_DEL($param)
+		{
+			return $this->_tag_close_S($param);
+		}
+
+		/**
+		 * tag : U
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_U($param, $other='u')
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-underline'] = true;
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : INS
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_INS($param)
+		{
+			return $this->_tag_open_U($param, 'ins');
+		}
+
+		/**
+		 * tag : U
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_U($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : INS
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_INS($param)
+		{
+			return $this->_tag_close_U($param);
+		}
+
+		/**
+		 * tag : A
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_A($param)
+		{
+			$this->_isInLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
+
+			if (isset($param['name'])) {
+				$name =     $param['name'];
+				if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+
+				if (!$this->_lstAnchor[$name][1]) {
+					$this->_lstAnchor[$name][1] = true;
+					$this->pdf->SetLink($this->_lstAnchor[$name][0], -1, -1);
+				}
+			}
+
+			if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
+				$name = $match[1];
+				if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+
+				$this->_isInLink = $this->_lstAnchor[$name][0];
+			}
+
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-underline'] = true;
+			$this->parsingCss->value['color'] = array(20, 20, 250);
+			$this->parsingCss->analyse('a', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : A
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_A($param)
+		{
+			$this->_isInLink    = '';
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : H1
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_H1($param, $other = 'h1')
+		{
+			if ($this->_isForOneLine) return false;
+
+			if ($this->_maxH) $this->_tag_open_BR(array());
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-bold'] = true;
+
+			$size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
+			$this->parsingCss->value['margin']['l'] = 0;
+			$this->parsingCss->value['margin']['r'] = 0;
+			$this->parsingCss->value['margin']['t'] = $this->parsingCss->ConvertToMM('16px');
+			$this->parsingCss->value['margin']['b'] = $this->parsingCss->ConvertToMM('16px');
+			$this->parsingCss->value['font-size'] = $this->parsingCss->ConvertToMM($size[$other]);
+
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			$this->_setNewPositionForNewLine();
+
+			return true;
+		}
+
+		/**
+		 * tag : H2
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_H2($param)
+		{
+			return $this->_tag_open_H1($param, 'h2');
+		}
+
+		/**
+		 * tag : H3
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_H3($param)
+		{
+			return $this->_tag_open_H1($param, 'h3');
+		}
+
+		/**
+		 * tag : H4
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_H4($param)
+		{
+			return $this->_tag_open_H1($param, 'h4');
+		}
+
+		/**
+		 * tag : H5
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_H5($param)
+		{
+			return $this->_tag_open_H1($param, 'h5');
+		}
+
+		/**
+		 * tag : H6
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_H6($param)
+		{
+			return $this->_tag_open_H1($param, 'h6');
+		}
+
+		/**
+		 * tag : H1
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H1($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH+= $this->parsingCss->value['margin']['b'];
+			$h = max($this->_maxH, $this->parsingCss->getLineHeight());
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			$this->_makeBreakLine($h);
+			$this->_maxH = 0;
+
+			$this->_maxY = max($this->_maxY, $this->pdf->getY());
+
+			return true;
+		}
+
+		/**
+		 * tag : H2
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H2($param)
+		{
+			return $this->_tag_close_H1($param);
+		}
+
+		/**
+		 * tag : H3
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H3($param)
+		{
+			return $this->_tag_close_H1($param);
+		}
+
+		/**
+		 * tag : H4
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H4($param)
+		{
+			return $this->_tag_close_H1($param);
+		}
+
+		/**
+		 * tag : H5
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H5($param)
+		{
+			return $this->_tag_close_H1($param);
+		}
+
+		/**
+		 * tag : H6
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_H6($param)
+		{
+			return $this->_tag_close_H1($param);
+		}
+
+		/**
+		 * tag : SPAN
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_SPAN($param, $other = 'span')
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : FONT
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_FONT($param)
+		{
+			return $this->_tag_open_SPAN($param, 'font');
+		}
+
+		/**
+		 * tag : LABEL
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_LABEL($param)
+		{
+			return $this->_tag_open_SPAN($param, 'label');
+		}
+
+		/**
+		 * tag : SPAN
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SPAN($param)
+		{
+			$this->parsingCss->restorePosition();
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : FONT
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_FONT($param)
+		{
+			return $this->_tag_close_SPAN($param);
+		}
+
+		/**
+		 * tag : LABEL
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_LABEL($param)
+		{
+			return $this->_tag_close_SPAN($param);
+		}
+
+		/**
+		 * tag : P
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_P($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
+				if ($this->_maxH) $this->_tag_open_BR(array());
+			}
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('p', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			 // cancel the effects of the setPosition
+			$this->pdf->setXY($this->pdf->getX()-$this->parsingCss->value['margin']['l'], $this->pdf->getY()-$this->parsingCss->value['margin']['t']);
+
+			list($mL, $mR) = $this->_getMargins($this->pdf->getY());
+			$mR = $this->pdf->getW()-$mR;
+			$mL+= $this->parsingCss->value['margin']['l']+$this->parsingCss->value['padding']['l'];
+			$mR+= $this->parsingCss->value['margin']['r']+$this->parsingCss->value['padding']['r'];
+			$this->_saveMargin($mL, 0, $mR);
+
+			if ($this->parsingCss->value['text-indent']>0) {
+				$y = $this->pdf->getY()+$this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t'];
+				$this->_pageMarges[floor($y*100)] = array($mL+$this->parsingCss->value['text-indent'], $this->pdf->getW()-$mR);
+				$y+= $this->parsingCss->getLineHeight()*0.1;
+				$this->_pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
+			}
+			$this->_makeBreakLine($this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t']);
+			$this->_isInParagraph = array($mL, $mR);
+			return true;
+		}
+
+		/**
+		 * tag : P
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_P($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			if ($this->_maxH) $this->_tag_open_BR(array());
+			$this->_isInParagraph = false;
+			$this->_loadMargin();
+			$h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+			$this->_makeBreakLine($h);
+
+			return true;
+		}
+
+		/**
+		 * tag : PRE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_PRE($param, $other = 'pre')
+		{
+			if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
+
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-family'] = 'courier';
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			if ($other=='pre') return $this->_tag_open_DIV($param, $other);
+
+			return true;
+		}
+
+		/**
+		 * tag : CODE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_CODE($param)
+		{
+			return $this->_tag_open_PRE($param, 'code');
+		}
+
+		/**
+		 * tag : PRE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_close_PRE($param, $other = 'pre')
+		{
+			if ($other=='pre') {
+				if ($this->_isForOneLine) return false;
+
+				$this->_tag_close_DIV($param, $other);
+				$this->_tag_open_BR(array());
+			}
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : CODE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_CODE($param)
+		{
+			return $this->_tag_close_PRE($param, 'code');
+		}
+
+		/**
+		 * tag : BIG
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_BIG($param)
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.12;
+			$this->parsingCss->value['mini-size'] *= 1.2;
+			$this->parsingCss->analyse('big', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			return true;
+		}
+
+		/**
+		 * tag : BIG
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_BIG($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : SMALL
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_SMALL($param)
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.05;
+			$this->parsingCss->value['mini-size'] *= 0.82;
+			$this->parsingCss->analyse('small', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			return true;
+		}
+
+		/**
+		 * tag : SMALL
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SMALL($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : SUP
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_SUP($param)
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.15;
+			$this->parsingCss->value['mini-size'] *= 0.75;
+			$this->parsingCss->analyse('sup', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : SUP
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SUP($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : SUB
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_SUB($param)
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.15;
+			$this->parsingCss->value['mini-size'] *= 0.75;
+			$this->parsingCss->analyse('sub', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+			return true;
+		}
+
+		/**
+		 * tag : SUB
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SUB($param)
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : UL
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @param  string $other
+		 * @return boolean
+		 */
+		protected function _tag_open_UL($param, $other = 'ul')
+		{
+			if ($this->_isForOneLine) return false;
+
+			if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
+				if ($this->_maxH) $this->_tag_open_BR(array());
+				if (!count($this->_defList)) $this->_tag_open_BR(array());
+			}
+
+			if (!isset($param['style']['width'])) $param['allwidth'] = true;
+			$param['cellspacing'] = 0;
+
+			// a list is like a table
+			$this->_tag_open_TABLE($param, $other);
+
+			// add a level of list
+			$this->_listeAddLevel($other, $this->parsingCss->value['list-style-type'], $this->parsingCss->value['list-style-image']);
+
+			return true;
+		}
+
+		/**
+		 * tag : OL
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_OL($param)
+		{
+			return $this->_tag_open_UL($param, 'ol');
+		}
+
+		/**
+		 * tag : UL
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_UL($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_tag_close_TABLE($param);
+
+			$this->_listeDelLevel();
+
+			if (!$this->_subPart) {
+				if (!count($this->_defList)) $this->_tag_open_BR(array());
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : OL
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_OL($param)
+		{
+			return $this->_tag_close_UL($param);
+		}
+
+		/**
+		 * tag : LI
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_LI($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_listeAddLi();
+
+			if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
+
+			$paramPUCE = $param;
+
+			$inf = $this->_listeGetLi();
+			if ($inf[0]) {
+				$paramPUCE['style']['font-family']     = $inf[0];
+				$paramPUCE['style']['text-align']      = 'li_right';
+				$paramPUCE['style']['vertical-align']  = 'top';
+				$paramPUCE['style']['width']           = $this->_listeGetWidth();
+				$paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
+				$paramPUCE['txt'] = $inf[2];
+			} else {
+				$paramPUCE['style']['text-align']      = 'li_right';
+				$paramPUCE['style']['vertical-align']  = 'top';
+				$paramPUCE['style']['width']           = $this->_listeGetWidth();
+				$paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
+				$paramPUCE['src'] = $inf[2];
+				$paramPUCE['sub_li'] = true;
+			}
+
+			$this->_tag_open_TR($param, 'li');
+
+			$this->parsingCss->save();
+
+			// if small LI
+			if ($inf[1]) {
+				$this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.045;
+				$this->parsingCss->value['mini-size'] *= 0.75;
+			}
+
+			// if we are in a sub html => prepare. Else : display
+			if ($this->_subPart) {
+				// TD for the puce
+				$tmpPos = $this->_tempPos;
+				$tmpLst1 = $this->parsingHtml->code[$tmpPos+1];
+				$tmpLst2 = $this->parsingHtml->code[$tmpPos+2];
+				$this->parsingHtml->code[$tmpPos+1] = array();
+				$this->parsingHtml->code[$tmpPos+1]['name']    = (isset($paramPUCE['src'])) ? 'img' : 'write';
+				$this->parsingHtml->code[$tmpPos+1]['param']    = $paramPUCE; unset($this->parsingHtml->code[$tmpPos+1]['param']['style']['width']);
+				$this->parsingHtml->code[$tmpPos+1]['close']    = 0;
+				$this->parsingHtml->code[$tmpPos+2] = array();
+				$this->parsingHtml->code[$tmpPos+2]['name']    = 'li';
+				$this->parsingHtml->code[$tmpPos+2]['param']    = $paramPUCE;
+				$this->parsingHtml->code[$tmpPos+2]['close']    = 1;
+				$this->_tag_open_TD($paramPUCE, 'li_sub');
+				$this->_tag_close_TD($param);
+				$this->_tempPos = $tmpPos;
+				$this->parsingHtml->code[$tmpPos+1] = $tmpLst1;
+				$this->parsingHtml->code[$tmpPos+2] = $tmpLst2;
+			} else {
+				// TD for the puce
+				$this->_tag_open_TD($paramPUCE, 'li_sub');
+				unset($paramPUCE['style']['width']);
+				if (isset($paramPUCE['src']))    $this->_tag_open_IMG($paramPUCE);
+				else                            $this->_tag_open_WRITE($paramPUCE);
+				$this->_tag_close_TD($paramPUCE);
+			}
+			$this->parsingCss->load();
+
+
+			// TD for the content
+			$this->_tag_open_TD($param, 'li');
+
+			return true;
+		}
+
+		/**
+		 * tag : LI
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_LI($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_tag_close_TD($param);
+
+			$this->_tag_close_TR($param);
+
+			return true;
+		}
+
+		/**
+		 * tag : TBODY
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TBODY($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('tbody', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : TBODY
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TBODY($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : THEAD
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_THEAD($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('thead', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			// if we are in a sub part, save the number of the first TR in the thead
+			if ($this->_subPart) {
+				HTML2PDF::$_tables[$param['num']]['thead']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
+				HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
+				for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
+					$action = $this->parsingHtml->code[$pos];
+					if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
+					HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
+					if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
+				}
+			} else {
+				$level = $this->parsingHtml->getLevel($this->_parsePos);
+				$this->_parsePos+= count($level);
+				HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['thead']['tr']);
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : THEAD
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_THEAD($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			// if we are in a sub HTM, construct the list of the TR in the thead
+			if ($this->_subPart) {
+				$min = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
+				$max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+				HTML2PDF::$_tables[$param['num']]['thead']['tr'] = range($min, $max);
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TFOOT
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TFOOT($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('tfoot', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			// if we are in a sub part, save the number of the first TR in the tfoot
+			if ($this->_subPart) {
+				HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
+				HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
+				for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
+					$action = $this->parsingHtml->code[$pos];
+					if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
+					HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
+					if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
+				}
+			} else {
+				$level = $this->parsingHtml->getLevel($this->_parsePos);
+				$this->_parsePos+= count($level);
+				HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['tfoot']['tr']);
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TFOOT
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TFOOT($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			// if we are in a sub HTM, construct the list of the TR in the tfoot
+			if ($this->_subPart) {
+				$min = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
+				$max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+				HTML2PDF::$_tables[$param['num']]['tfoot']['tr'] = range($min, $max);
+			}
+
+			return true;
+		}
+
+		/**
+		 * It is not a real TAG, does not use it !
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_THEAD_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('thead', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * It is not a real TAG, does not use it !
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_THEAD_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * It is not a real TAG, does not use it !
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TFOOT_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('tfoot', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * It is not a real TAG, does not use it !
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TFOOT_SUB($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : FORM
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_FORM($param)
+		{
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('form', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$this->pdf->setFormDefaultProp(
+				array(
+					'lineWidth'=>1,
+					'borderStyle'=>'solid',
+					'fillColor'=>array(220, 220, 255),
+					'strokeColor'=>array(128, 128, 200)
+				)
+			);
+
+			$this->_isInForm = isset($param['action']) ? $param['action'] : '';
+
+			return true;
+		}
+
+		/**
+		 * tag : FORM
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_FORM($param)
+		{
+			$this->_isInForm = false;
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : TABLE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TABLE($param, $other = 'table')
+		{
+			if ($this->_maxH) {
+				if ($this->_isForOneLine) return false;
+				$this->_tag_open_BR(array());
+			}
+
+			if ($this->_isForOneLine) {
+				$this->_maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				return false;
+			}
+
+			$this->_maxH = 0;
+
+			$alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
+			if (isset($param['align'])) unset($param['align']);
+			if (!in_array($alignObject, array('left', 'center', 'right'))) $alignObject = 'left';
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+
+			// collapse table ?
+			$collapse = false;
+			if ($other=='table') {
+				$collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
+			}
+
+			// if collapse => no borders for the table, only for TD
+			if ($collapse) {
+				$param['style']['border'] = 'none';
+				$param['cellspacing'] = 0;
+				$none = $this->parsingCss->readBorder('none');
+				$this->parsingCss->value['border']['t'] = $none;
+				$this->parsingCss->value['border']['r'] = $none;
+				$this->parsingCss->value['border']['b'] = $none;
+				$this->parsingCss->value['border']['l'] = $none;
+			}
+
+			// if we are in a SUB html => prepare the properties of the table
+			if ($this->_subPart) {
+				if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
+				HTML2PDF::$_tables[$param['num']] = array();
+				HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
+				HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
+				HTML2PDF::$_tables[$param['num']]['cellspacing']     = $this->parsingCss->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
+				HTML2PDF::$_tables[$param['num']]['cases']           = array();          // properties of each TR/TD
+				HTML2PDF::$_tables[$param['num']]['corr']            = array();          // link between TR/TD and colspan/rowspan
+				HTML2PDF::$_tables[$param['num']]['corr_x']          = 0;                // position in 'cases'
+				HTML2PDF::$_tables[$param['num']]['corr_y']          = 0;                // position in 'cases'
+				HTML2PDF::$_tables[$param['num']]['td_curr']         = 0;                // current column
+				HTML2PDF::$_tables[$param['num']]['tr_curr']         = 0;                // current row
+				HTML2PDF::$_tables[$param['num']]['curr_x']          = $this->pdf->getX();
+				HTML2PDF::$_tables[$param['num']]['curr_y']          = $this->pdf->getY();
+				HTML2PDF::$_tables[$param['num']]['width']           = 0;                // global width
+				HTML2PDF::$_tables[$param['num']]['height']          = 0;                // global height
+				HTML2PDF::$_tables[$param['num']]['align']           = $alignObject;
+				HTML2PDF::$_tables[$param['num']]['marge']           = array();
+				HTML2PDF::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t']+$this->parsingCss->value['border']['t']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
+				HTML2PDF::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r']+$this->parsingCss->value['border']['r']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
+				HTML2PDF::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b']+$this->parsingCss->value['border']['b']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
+				HTML2PDF::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l']+$this->parsingCss->value['border']['l']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
+				HTML2PDF::$_tables[$param['num']]['page']            = 0;                // number of pages
+				HTML2PDF::$_tables[$param['num']]['new_page']        = true;             // flag : new page for the current TR
+				HTML2PDF::$_tables[$param['num']]['style_value']     = null;             // CSS style of the table
+				HTML2PDF::$_tables[$param['num']]['thead']           = array();          // properties on the thead
+				HTML2PDF::$_tables[$param['num']]['tfoot']           = array();          // properties on the tfoot
+				HTML2PDF::$_tables[$param['num']]['thead']['tr']     = array();          // list of the TRs in the thead
+				HTML2PDF::$_tables[$param['num']]['tfoot']['tr']     = array();          // list of the TRs in the tfoot
+				HTML2PDF::$_tables[$param['num']]['thead']['height']    = 0;             // thead height
+				HTML2PDF::$_tables[$param['num']]['tfoot']['height']    = 0;             // tfoot height
+				HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();            // HTML content of the thead
+				HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();            // HTML content of the tfoot
+				HTML2PDF::$_tables[$param['num']]['cols']        = array();              // properties of the COLs
+
+				$this->_saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
+
+				$this->parsingCss->value['width']-= HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
+			} else {
+				// we start from the first page and the first page of the table
+				HTML2PDF::$_tables[$param['num']]['page'] = 0;
+				HTML2PDF::$_tables[$param['num']]['td_curr']    = 0;
+				HTML2PDF::$_tables[$param['num']]['tr_curr']    = 0;
+				HTML2PDF::$_tables[$param['num']]['td_x']        = HTML2PDF::$_tables[$param['num']]['marge']['l']+HTML2PDF::$_tables[$param['num']]['curr_x'];
+				HTML2PDF::$_tables[$param['num']]['td_y']        = HTML2PDF::$_tables[$param['num']]['marge']['t']+HTML2PDF::$_tables[$param['num']]['curr_y'];
+
+				// draw the borders/background of the first page/part of the table
+				$this->_drawRectangle(
+					HTML2PDF::$_tables[$param['num']]['curr_x'],
+					HTML2PDF::$_tables[$param['num']]['curr_y'],
+					HTML2PDF::$_tables[$param['num']]['width'],
+					isset(HTML2PDF::$_tables[$param['num']]['height'][0]) ? HTML2PDF::$_tables[$param['num']]['height'][0] : null,
+					$this->parsingCss->value['border'],
+					$this->parsingCss->value['padding'],
+					0,
+					$this->parsingCss->value['background']
+				);
+
+				HTML2PDF::$_tables[$param['num']]['style_value'] = $this->parsingCss->value;
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TABLE
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TABLE($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			// if we are in a sub HTML
+			if ($this->_subPart) {
+				// calculate the size of each case
+				$this->_calculateTableCellSize(HTML2PDF::$_tables[$param['num']]['cases'], HTML2PDF::$_tables[$param['num']]['corr']);
+
+				// calculate the height of the thead and the tfoot
+				$lst = array('thead', 'tfoot');
+				foreach ($lst as $mode) {
+					HTML2PDF::$_tables[$param['num']][$mode]['height'] = 0;
+					foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
+						// hauteur de la ligne tr
+						$h = 0;
+						for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
+							if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
+								$h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
+						HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
+					}
+				}
+
+				// calculate the width of the table
+				HTML2PDF::$_tables[$param['num']]['width'] = HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
+				if (isset(HTML2PDF::$_tables[$param['num']]['cases'][0])) {
+					foreach (HTML2PDF::$_tables[$param['num']]['cases'][0] as $case) {
+						HTML2PDF::$_tables[$param['num']]['width']+= $case['w'];
+					}
+				}
+
+				// X position of the table
+				$old = $this->parsingCss->getOldValues();
+				$parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				$x = HTML2PDF::$_tables[$param['num']]['curr_x'];
+				$w = HTML2PDF::$_tables[$param['num']]['width'];
+				if ($parentWidth>$w) {
+					if (HTML2PDF::$_tables[$param['num']]['align']=='center')
+						$x = $x + ($parentWidth-$w)*0.5;
+					else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
+						$x = $x + $parentWidth-$w;
+
+					HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
+				}
+
+				// calculate the height of the table
+				HTML2PDF::$_tables[$param['num']]['height'] = array();
+
+				// minimum of the height because of margins, and of the thead and tfoot height
+				$h0 = HTML2PDF::$_tables[$param['num']]['marge']['t'] + HTML2PDF::$_tables[$param['num']]['marge']['b'];
+				$h0+= HTML2PDF::$_tables[$param['num']]['thead']['height'] + HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
+
+				// max height of the page
+				$max = $this->pdf->getH() - $this->pdf->getbMargin();
+
+				// current position on the page
+				$y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+				$height = $h0;
+
+				// we get the height of each line
+				for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
+
+					// if it is a TR of the thead or of the tfoot => skip
+					if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
+					if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) continue;
+
+					// height of the line
+					$th = 0;
+					$h = 0;
+					for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
+						$h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+
+						if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
+							$th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+					}
+
+					// if the row does not fit on the page => new page
+					if ($y+$h+$height>$max) {
+						if ($height==$h0) $height = null;
+						HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+						$height = $h0;
+						$y = $this->_margeTop;
+					}
+					$height+= $th;
+				}
+
+				// if ther is a height at the end, add it
+				if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+			} else {
+				// if we have tfoor, draw it
+				if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
+					$tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
+					$tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
+					$oldParsePos = $this->_parsePos;
+					$oldParseCode = $this->parsingHtml->code;
+
+					HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
+					HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
+					$this->_parsePos = 0;
+					$this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
+					$this->_isInTfoot = true;
+					$this->_makeHTMLcode();
+					$this->_isInTfoot = false;
+
+					$this->_parsePos =     $oldParsePos;
+					$this->parsingHtml->code = $oldParseCode;
+					HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
+					HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
+				}
+
+				// get the positions of the end of the table
+				$x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
+				if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
+					$y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+				else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
+					$y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+				else
+					$y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+
+				$this->_maxX = max($this->_maxX, $x);
+				$this->_maxY = max($this->_maxY, $y);
+
+				$this->pdf->setXY($this->pdf->getlMargin(), $y);
+
+				$this->_loadMargin();
+
+				if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
+			}
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+
+			return true;
+		}
+
+		/**
+		 * tag : COL
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_COL($param)
+		{
+			$span = isset($param['span']) ? $param['span'] : 1;
+			for ($k=0; $k<$span; $k++)
+				HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
+		}
+
+		/**
+		 * tag : COL
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_COL($param)
+		{
+			// there is nothing to do here
+
+			return true;
+		}
+
+		/**
+		 * tag : TR
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TR($param, $other = 'tr')
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse($other, $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			// position in the table
+			HTML2PDF::$_tables[$param['num']]['tr_curr']++;
+			HTML2PDF::$_tables[$param['num']]['td_curr']= 0;
+
+			// if we are not in a sub html
+			if (!$this->_subPart) {
+
+				// Y after the row
+				$ty=null;
+				for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
+					$ty = max($ty, HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h']);
+				}
+
+				// height of the tfoot
+				$hfoot = HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
+
+				// if the line does not fit on the page => new page
+				if (!$this->_isInTfoot && HTML2PDF::$_tables[$param['num']]['td_y'] + HTML2PDF::$_tables[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin()) {
+
+					// fi ther is a tfoot => draw it
+					if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
+						$tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
+						$tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
+						$oldParsePos = $this->_parsePos;
+						$oldParseCode = $this->parsingHtml->code;
+
+						HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
+						HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
+						$this->_parsePos = 0;
+						$this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
+						$this->_isInTfoot = true;
+						$this->_makeHTMLcode();
+						$this->_isInTfoot = false;
+
+						$this->_parsePos =     $oldParsePos;
+						$this->parsingHtml->code = $oldParseCode;
+						HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
+						HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
+					}
+
+					// new page
+					HTML2PDF::$_tables[$param['num']]['new_page'] = true;
+					$this->_setNewPage();
+
+					// new position
+					HTML2PDF::$_tables[$param['num']]['page']++;
+					HTML2PDF::$_tables[$param['num']]['curr_y'] = $this->pdf->getY();
+					HTML2PDF::$_tables[$param['num']]['td_y'] = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['marge']['t'];
+
+					// if we have the height of the tbale on the page => draw borders and background
+					if (isset(HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']])) {
+						$old = $this->parsingCss->value;
+						$this->parsingCss->value = HTML2PDF::$_tables[$param['num']]['style_value'];
+
+						$this->_drawRectangle(
+							HTML2PDF::$_tables[$param['num']]['curr_x'],
+							HTML2PDF::$_tables[$param['num']]['curr_y'],
+							HTML2PDF::$_tables[$param['num']]['width'],
+							HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']],
+							$this->parsingCss->value['border'],
+							$this->parsingCss->value['padding'],
+							HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
+							$this->parsingCss->value['background']
+						);
+
+						$this->parsingCss->value = $old;
+					}
+				}
+
+				// if we are in a new page, and if we have a thead => draw it
+				if (HTML2PDF::$_tables[$param['num']]['new_page'] && count(HTML2PDF::$_tables[$param['num']]['thead']['code'])) {
+					HTML2PDF::$_tables[$param['num']]['new_page'] = false;
+					$tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
+					$tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
+					$oldParsePos = $this->_parsePos;
+					$oldParseCode = $this->parsingHtml->code;
+
+					HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
+					HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
+					$this->_parsePos = 0;
+					$this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['thead']['code'];
+					$this->_isInThead = true;
+					$this->_makeHTMLcode();
+					$this->_isInThead = false;
+
+					$this->_parsePos =     $oldParsePos;
+					$this->parsingHtml->code = $oldParseCode;
+					HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
+					HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
+					HTML2PDF::$_tables[$param['num']]['new_page'] = true;
+				}
+			// else (in a sub HTML)
+			} else {
+				// prepare it
+				HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
+				if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
+					HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
+
+				HTML2PDF::$_tables[$param['num']]['corr_x']=0;
+				while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
+					HTML2PDF::$_tables[$param['num']]['corr_x']++;
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TR
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TR($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			// if we are not in a sub HTML
+			if (!$this->_subPart) {
+
+				// Y of the current line
+				$ty=null;
+				for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
+					if (HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['rowspan']==1) {
+						$ty = HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h'];
+					}
+				}
+
+				// new position
+				HTML2PDF::$_tables[$param['num']]['td_x'] = HTML2PDF::$_tables[$param['num']]['curr_x']+HTML2PDF::$_tables[$param['num']]['marge']['l'];
+				HTML2PDF::$_tables[$param['num']]['td_y']+= $ty;
+				HTML2PDF::$_tables[$param['num']]['new_page'] = false;
+			} else {
+				HTML2PDF::$_tables[$param['num']]['corr_y']++;
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TD
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TD($param, $other = 'td')
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			$param['cellpadding'] = HTML2PDF::$_tables[$param['num']]['cellpadding'].'mm';
+			$param['cellspacing'] = HTML2PDF::$_tables[$param['num']]['cellspacing'].'mm';
+
+			// specific style for LI
+			if ($other=='li') {
+				$specialLi = true;
+			} else {
+				$specialLi = false;
+				if ($other=='li_sub') {
+					$param['style']['border'] = 'none';
+					$param['style']['background-color']    = 'transparent';
+					$param['style']['background-image']    = 'none';
+					$param['style']['background-position'] = '';
+					$param['style']['background-repeat']   = '';
+					$other = 'li';
+				}
+			}
+
+			// get the properties of the TD
+			$x = HTML2PDF::$_tables[$param['num']]['td_curr'];
+			$y = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+			$colspan = isset($param['colspan']) ? $param['colspan'] : 1;
+			$rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
+
+			// flag for collapse table
+			$collapse = false;
+
+			// specific traitment for TD and TH
+			if (in_array($other, array('td', 'th'))) {
+				// id of the column
+				$numCol = isset(HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr']) ? HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] : HTML2PDF::$_tables[$param['num']]['corr_x'];
+
+				// we get the properties of the COL tag, if exist
+				if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol])) {
+
+					$colParam = HTML2PDF::$_tables[$param['num']]['cols'][$numCol];
+
+					// for colspans => we get all the neede widths
+					$colParam['style']['width'] = array();
+					for ($k=0; $k<$colspan; $k++) {
+						if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'])) {
+							$colParam['style']['width'][] = HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'];
+						}
+					}
+
+					// calculate the total width of the column
+					$total = '';
+					$last = $this->parsingCss->getLastWidth();
+					if (count($colParam['style']['width'])) {
+						$total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
+						foreach ($colParam['style']['width'] as $width) {
+							if (substr($total, -1)=='%' && substr($width, -1)=='%')
+								$total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
+							else
+								$total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+						}
+					}
+
+					// get the final width
+					if ($total) {
+						$colParam['style']['width'] = $total;
+					} else {
+						unset($colParam['style']['width']);
+					}
+
+
+					// merge the styles of the COL and the TD
+					$param['style'] = array_merge($colParam['style'], $param['style']);
+
+					// merge the class of the COL and the TD
+					if (isset($colParam['class'])) {
+						$param['class'] = $colParam['class'].(isset($param['class']) ? ' '.$param['class'] : '');
+					}
+				}
+
+				$collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
+			}
+
+			$this->parsingCss->save();
+
+			// legacy for TD and TH
+			$legacy = null;
+			if (in_array($other, array('td', 'th'))) {
+				$legacy = array();
+
+				$old = $this->parsingCss->getLastValue('background');
+				if ($old && ($old['color'] || $old['image']))
+					$legacy['background'] = $old;
+
+				if (HTML2PDF::$_tables[$param['num']]['border']) {
+					$legacy['border'] = array();
+					$legacy['border']['l'] = HTML2PDF::$_tables[$param['num']]['border'];
+					$legacy['border']['t'] = HTML2PDF::$_tables[$param['num']]['border'];
+					$legacy['border']['r'] = HTML2PDF::$_tables[$param['num']]['border'];
+					$legacy['border']['b'] = HTML2PDF::$_tables[$param['num']]['border'];
+				}
+			}
+			$return = $this->parsingCss->analyse($other, $param, $legacy);
+
+			if ($specialLi) {
+				$this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetWidth());
+				$this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetPadding());
+			}
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			// if tale collapse => modify the borders
+			if ($collapse) {
+				if (!$this->_subPart) {
+					if (
+						(HTML2PDF::$_tables[$param['num']]['tr_curr']>1 && !HTML2PDF::$_tables[$param['num']]['new_page']) ||
+						(!$this->_isInThead && count(HTML2PDF::$_tables[$param['num']]['thead']['code']))
+					) {
+						$this->parsingCss->value['border']['t'] = $this->parsingCss->readBorder('none');
+					}
+				}
+
+				if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
+					if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+					$this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
+				}
+			}
+
+			// margins of the table
+			$marge = array();
+			$marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
+			$marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
+			$marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
+			$marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
+
+			// if we are in a sub HTML
+			if ($this->_subPart) {
+				// new position in the table
+				HTML2PDF::$_tables[$param['num']]['td_curr']++;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x] = array();
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] = 0;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'] = 0;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'] = 0;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] = HTML2PDF::$_tables[$param['num']]['corr_x'];
+				HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Yr'] = HTML2PDF::$_tables[$param['num']]['corr_y'];
+
+				// prepare the mapping for rowspan and colspan
+				for ($j=0; $j<$rowspan; $j++) {
+					for ($i=0; $i<$colspan; $i++) {
+						HTML2PDF::$_tables[$param['num']]['corr']
+							[HTML2PDF::$_tables[$param['num']]['corr_y']+$j]
+							[HTML2PDF::$_tables[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
+					}
+				}
+				HTML2PDF::$_tables[$param['num']]['corr_x']+= $colspan;
+				while (isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
+					HTML2PDF::$_tables[$param['num']]['corr_x']++;
+				}
+
+				// extract the content of the TD, and calculate his size
+				$level = $this->parsingHtml->getLevel($this->_tempPos);
+				$this->_createSubHTML($this->_subHtml);
+				$this->_subHtml->parsingHtml->code = $level;
+				$this->_subHtml->_makeHTMLcode();
+				$this->_tempPos+= count($level);
+			} else {
+				// new position in the table
+				HTML2PDF::$_tables[$param['num']]['td_curr']++;
+				HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'];
+
+				// borders and background of the TD
+				$this->_drawRectangle(
+					HTML2PDF::$_tables[$param['num']]['td_x'],
+					HTML2PDF::$_tables[$param['num']]['td_y'],
+					HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'],
+					HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'],
+					$this->parsingCss->value['border'],
+					$this->parsingCss->value['padding'],
+					HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
+					$this->parsingCss->value['background']
+				);
+
+				$this->parsingCss->value['width'] = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
+
+				// marges = size of the TD
+				$mL = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
+				$this->_saveMargin($mL, 0, $mR);
+
+				// position of the content, from vertical-align
+				$hCorr = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'];
+				$hReel = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['real_h'];
+				switch($this->parsingCss->value['vertical-align'])
+				{
+					case 'bottom':
+						$yCorr = $hCorr-$hReel;
+						break;
+
+					case 'middle':
+						$yCorr = ($hCorr-$hReel)*0.5;
+						break;
+
+					case 'top':
+					default:
+						$yCorr = 0;
+						break;
+				}
+
+				//  position of the content
+				$x = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
+				$y = HTML2PDF::$_tables[$param['num']]['td_y']+$marge['t']+$yCorr;
+				$this->pdf->setXY($x, $y);
+				$this->_setNewPositionForNewLine();
+			}
+
+			return true;
+		}
+
+		/**
+		 * tag : TD
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TD($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_maxH = 0;
+
+			// get the margins
+			$marge = array();
+			$marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
+			$marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
+			$marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
+			$marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
+			$marge['t']+= 0.001;
+			$marge['r']+= 0.001;
+			$marge['b']+= 0.001;
+			$marge['l']+= 0.001;
+
+			// if we are in a sub HTML
+			if ($this->_subPart) {
+
+				// it msut take only one page
+				if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage()>1) {
+					throw new HTML2PDF_exception(7);
+				}
+
+				// size of the content of the TD
+				$w0 = $this->_subHtml->_maxX + $marge['l'] + $marge['r'];
+				$h0 = $this->_subHtml->_maxY + $marge['t'] + $marge['b'];
+
+				// size from the CSS style
+				$w2 = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'];
+				$h2 = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
+
+				// final size of the TD
+				HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
+				HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
+
+				// real position of the content
+				HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_w'] = $w0;
+				HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_h'] = $h0;
+
+				// destroy the sub HTML
+				$this->_destroySubHTML($this->_subHtml);
+			} else {
+				$this->_loadMargin();
+
+				HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'];
+			}
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+
+		/**
+		 * tag : TH
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TH($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->parsingCss->save();
+			$this->parsingCss->value['font-bold'] = true;
+
+			$this->_tag_open_TD($param, 'th');
+
+			return true;
+		}
+
+		/**
+		 * tag : TH
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TH($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->_tag_close_TD($param);
+
+			$this->parsingCss->load();
+
+			return true;
+		}
+
+		/**
+		 * tag : IMG
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_IMG($param)
+		{
+			$src    = str_replace('&amp;', '&', $param['src']);
+
+			$this->parsingCss->save();
+			$this->parsingCss->value['width']    = 0;
+			$this->parsingCss->value['height']    = 0;
+			$this->parsingCss->value['border']    = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
+			$this->parsingCss->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+			$this->parsingCss->analyse('img', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$res = $this->_drawImage($src, isset($param['sub_li']));
+			if (!$res) return $res;
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+			$this->_maxE++;
+
+			return true;
+		}
+
+		/**
+		 * tag : SELECT
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_SELECT($param)
+		{
+			if (!isset($param['name'])) {
+				$param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
+			}
+
+			$param['name'] = strtolower($param['name']);
+
+			if (isset($this->_lstField[$param['name']])) {
+				$this->_lstField[$param['name']]++;
+			} else {
+				$this->_lstField[$param['name']] = 1;
+			}
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('select', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$this->_lstSelect = array();
+			$this->_lstSelect['name']    = $param['name'];
+			$this->_lstSelect['multi']    = isset($param['multiple']) ? true : false;
+			$this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
+			$this->_lstSelect['options']    = array();
+
+			if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
+
+			return true;
+		}
+
+		/**
+		 * tag : OPTION
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_OPTION($param)
+		{
+			// get the content of the option : it is the text of the option
+			$level = $this->parsingHtml->getLevel($this->_parsePos);
+			$this->_parsePos+= count($level);
+			$value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_'.(count($this->_lstSelect)+1);
+
+			$this->_lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
+
+			return true;
+		}
+
+		/**
+		 * tag : OPTION
+		 * mode : CLOSE
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_OPTION($param)
+		{
+			// nothing to do here
+
+			return true;
+		}
+
+		/**
+		 * tag : SELECT
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_SELECT()
+		{
+			// position of the select
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$f = 1.08*$this->parsingCss->value['font-size'];
+
+			// width
+			$w = $this->parsingCss->value['width']; if (!$w) $w = 50;
+
+			// height (automatic)
+			$h = ($f*1.07*$this->_lstSelect['size'] + 1);
+
+			$prop = $this->parsingCss->getFormStyle();
+
+			// multy select
+			if ($this->_lstSelect['multi']) {
+				$prop['multipleSelection'] = 'true';
+			}
+
+
+			// single or multi select
+			if ($this->_lstSelect['size']>1) {
+				$this->pdf->ListBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
+			} else {
+				$this->pdf->ComboBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
+			}
+
+			$this->_maxX = max($this->_maxX, $x+$w);
+			$this->_maxY = max($this->_maxY, $y+$h);
+			$this->_maxH = max($this->_maxH, $h);
+			$this->_maxE++;
+			$this->pdf->setX($x+$w);
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			$this->_lstSelect = array();
+
+			return true;
+		}
+
+		/**
+		 * tag : TEXTAREA
+		 * mode : OPEN
+		 *
+		 * @param    array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_TEXTAREA($param)
+		{
+			if (!isset($param['name'])) {
+				$param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
+			}
+
+			$param['name'] = strtolower($param['name']);
+
+			if (isset($this->_lstField[$param['name']])) {
+				$this->_lstField[$param['name']]++;
+			} else {
+				$this->_lstField[$param['name']] = 1;
+			}
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('textarea', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$fx = 0.65*$this->parsingCss->value['font-size'];
+			$fy = 1.08*$this->parsingCss->value['font-size'];
+
+			// extract the content the textarea : value
+			$level = $this->parsingHtml->getLevel($this->_parsePos);
+			$this->_parsePos+= count($level);
+
+			// automatic size, from cols and rows properties
+			$w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1;
+			$h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
+
+			$prop = $this->parsingCss->getFormStyle();
+
+			$prop['multiline'] = true;
+			$prop['value'] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
+
+			$this->pdf->TextField($param['name'], $w, $h, $prop, array(), $x, $y);
+
+			$this->_maxX = max($this->_maxX, $x+$w);
+			$this->_maxY = max($this->_maxY, $y+$h);
+			$this->_maxH = max($this->_maxH, $h);
+			$this->_maxE++;
+			$this->pdf->setX($x+$w);
+
+			return true;
+		}
+
+		/**
+		 * tag : TEXTAREA
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_TEXTAREA()
+		{
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : INPUT
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_INPUT($param)
+		{
+			if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
+			if (!isset($param['value'])) $param['value'] = '';
+			if (!isset($param['type']))  $param['type']  = 'text';
+
+			$param['name'] = strtolower($param['name']);
+			$param['type'] = strtolower($param['type']);
+
+			// the type must be valid
+			if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) {
+				$param['type'] = 'text';
+			}
+
+			if (isset($this->_lstField[$param['name']])) {
+				$this->_lstField[$param['name']]++;
+			} else {
+				$this->_lstField[$param['name']] = 1;
+			}
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('input', $param);
+			$this->parsingCss->setPosition();
+			$this->parsingCss->fontSet();
+
+			$name = $param['name'];
+
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$f = 1.08*$this->parsingCss->value['font-size'];
+
+			$prop = $this->parsingCss->getFormStyle();
+
+			switch($param['type'])
+			{
+				case 'checkbox':
+					$w = 3;
+					$h = $w;
+					if ($h<$f) $y+= ($f-$h)*0.5;
+					$checked = (isset($param['checked']) && $param['checked']=='checked');
+					$this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
+					break;
+
+				case 'radio':
+					$w = 3;
+					$h = $w;
+					if ($h<$f) $y+= ($f-$h)*0.5;
+					$checked = (isset($param['checked']) && $param['checked']=='checked');
+					$this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
+					break;
+
+				case 'hidden':
+					$w = 0;
+					$h = 0;
+					$prop['value'] = $param['value'];
+					$this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
+					break;
+
+				case 'text':
+					$w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+					$h = $f*1.3;
+					$prop['value'] = $param['value'];
+					$this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
+					break;
+
+				case 'submit':
+					$w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
+					$h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+					$action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
+					$this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
+					break;
+
+				case 'reset':
+					$w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
+					$h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+					$action = array('S'=>'ResetForm');
+					$this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
+					break;
+
+				case 'button':
+					$w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
+					$h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+					$action = isset($param['onclick']) ? $param['onclick'] : '';
+					$this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
+					break;
+
+				default:
+					$w = 0;
+					$h = 0;
+					break;
+			}
+
+			$this->_maxX = max($this->_maxX, $x+$w);
+			$this->_maxY = max($this->_maxY, $y+$h);
+			$this->_maxH = max($this->_maxH, $h);
+			$this->_maxE++;
+			$this->pdf->setX($x+$w);
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+
+			return true;
+		}
+
+		/**
+		 * tag : DRAW
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_DRAW($param)
+		{
+			if ($this->_isForOneLine) return false;
+			if ($this->_debugActif) $this->_DEBUG_add('DRAW', true);
+
+			$this->parsingCss->save();
+			$this->parsingCss->analyse('draw', $param);
+			$this->parsingCss->fontSet();
+
+			$alignObject = null;
+			if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+
+			$overW = $this->parsingCss->value['width'];
+			$overH = $this->parsingCss->value['height'];
+			$this->parsingCss->value['old_maxX'] = $this->_maxX;
+			$this->parsingCss->value['old_maxY'] = $this->_maxY;
+			$this->parsingCss->value['old_maxH'] = $this->_maxH;
+
+			$w = $this->parsingCss->value['width'];
+			$h = $this->parsingCss->value['height'];
+
+			if (!$this->parsingCss->value['position']) {
+				if (
+					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
+					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+					)
+					$this->_tag_open_BR(array());
+
+				if (
+						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
+						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
+						!$this->_isInOverflow
+					)
+					$this->_setNewPage();
+
+				$old = $this->parsingCss->getOldValues();
+				$parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+
+				if ($parentWidth>$w) {
+					if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+					else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+				}
+
+				$this->parsingCss->setPosition();
+			} else {
+				$old = $this->parsingCss->getOldValues();
+				$parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+
+				if ($parentWidth>$w) {
+					if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+					else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+				}
+
+				$this->parsingCss->setPosition();
+				$this->_saveMax();
+				$this->_maxX = 0;
+				$this->_maxY = 0;
+				$this->_maxH = 0;
+				$this->_maxE = 0;
+			}
+
+			$this->_drawRectangle(
+				$this->parsingCss->value['x'],
+				$this->parsingCss->value['y'],
+				$this->parsingCss->value['width'],
+				$this->parsingCss->value['height'],
+				$this->parsingCss->value['border'],
+				$this->parsingCss->value['padding'],
+				0,
+				$this->parsingCss->value['background']
+			);
+
+			$marge = array();
+			$marge['l'] = $this->parsingCss->value['border']['l']['width'];
+			$marge['r'] = $this->parsingCss->value['border']['r']['width'];
+			$marge['t'] = $this->parsingCss->value['border']['t']['width'];
+			$marge['b'] = $this->parsingCss->value['border']['b']['width'];
+
+			$this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
+			$this->parsingCss->value['height']-= $marge['t']+$marge['b'];
+
+			$overW-= $marge['l']+$marge['r'];
+			$overH-= $marge['t']+$marge['b'];
+
+			// clipping to draw only in the size opf the DRAW tag
+			$this->pdf->clippingPathStart(
+				$this->parsingCss->value['x']+$marge['l'],
+				$this->parsingCss->value['y']+$marge['t'],
+				$this->parsingCss->value['width'],
+				$this->parsingCss->value['height']
+			);
+
+			// left and right of the DRAW tag
+			$mL = $this->parsingCss->value['x']+$marge['l'];
+			$mR = $this->pdf->getW() - $mL - $overW;
+
+			// position of the DRAW tag
+			$x = $this->parsingCss->value['x']+$marge['l'];
+			$y = $this->parsingCss->value['y']+$marge['t'];
+
+			// prepare the drawing area
+			$this->_saveMargin($mL, 0, $mR);
+			$this->pdf->setXY($x, $y);
+
+			// we are in a draw tag
+			$this->_isInDraw = array(
+				'x' => $x,
+				'y' => $y,
+				'w' => $overW,
+				'h' => $overH,
+			);
+
+			// init the translate matrix : (0,0) => ($x, $y)
+			$this->pdf->doTransform(array(1,0,0,1,$x,$y));
+			$this->pdf->SetAlpha(1.);
+			return true;
+		}
+
+		/**
+		 * tag : DRAW
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_DRAW($param)
+		{
+			if ($this->_isForOneLine) return false;
+
+			$this->pdf->SetAlpha(1.);
+			$this->pdf->undoTransform();
+			$this->pdf->clippingPathStop();
+
+			$this->_maxX = $this->parsingCss->value['old_maxX'];
+			$this->_maxY = $this->parsingCss->value['old_maxY'];
+			$this->_maxH = $this->parsingCss->value['old_maxH'];
+
+			$marge = array();
+			$marge['l'] = $this->parsingCss->value['border']['l']['width'];
+			$marge['r'] = $this->parsingCss->value['border']['r']['width'];
+			$marge['t'] = $this->parsingCss->value['border']['t']['width'];
+			$marge['b'] = $this->parsingCss->value['border']['b']['width'];
+
+			$x = $this->parsingCss->value['x'];
+			$y = $this->parsingCss->value['y'];
+			$w = $this->parsingCss->value['width']+$marge['l']+$marge['r'];
+			$h = $this->parsingCss->value['height']+$marge['t']+$marge['b'];
+
+			if ($this->parsingCss->value['position']!='absolute') {
+				$this->pdf->setXY($x+$w, $y);
+
+				$this->_maxX = max($this->_maxX, $x+$w);
+				$this->_maxY = max($this->_maxY, $y+$h);
+				$this->_maxH = max($this->_maxH, $h);
+				$this->_maxE++;
+			} else {
+				// position
+				$this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
+
+				$this->_loadMax();
+			}
+
+			$block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
+
+			$this->parsingCss->load();
+			$this->parsingCss->fontSet();
+			$this->_loadMargin();
+
+			if ($block) $this->_tag_open_BR(array());
+			if ($this->_debugActif) $this->_DEBUG_add('DRAW', false);
+
+			$this->_isInDraw = null;
+
+			return true;
+		}
+
+		/**
+		 * tag : LINE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_LINE($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'LINE');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$styles['fill'] = null;
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$x1 = isset($param['x1']) ? $this->parsingCss->ConvertToMM($param['x1'], $this->_isInDraw['w']) : 0.;
+			$y1 = isset($param['y1']) ? $this->parsingCss->ConvertToMM($param['y1'], $this->_isInDraw['h']) : 0.;
+			$x2 = isset($param['x2']) ? $this->parsingCss->ConvertToMM($param['x2'], $this->_isInDraw['w']) : 0.;
+			$y2 = isset($param['y2']) ? $this->parsingCss->ConvertToMM($param['y2'], $this->_isInDraw['h']) : 0.;
+			$this->pdf->svgLine($x1, $y1, $x2, $y2);
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : RECT
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_RECT($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'RECT');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$x = isset($param['x']) ? $this->parsingCss->ConvertToMM($param['x'], $this->_isInDraw['w']) : 0.;
+			$y = isset($param['y']) ? $this->parsingCss->ConvertToMM($param['y'], $this->_isInDraw['h']) : 0.;
+			$w = isset($param['w']) ? $this->parsingCss->ConvertToMM($param['w'], $this->_isInDraw['w']) : 0.;
+			$h = isset($param['h']) ? $this->parsingCss->ConvertToMM($param['h'], $this->_isInDraw['h']) : 0.;
+
+			$this->pdf->svgRect($x, $y, $w, $h, $style);
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : CIRCLE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_CIRCLE($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'CIRCLE');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
+			$cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
+			$r = isset($param['r']) ? $this->parsingCss->ConvertToMM($param['r'], $this->_isInDraw['w']) : 0.;
+			$this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : ELLIPSE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_ELLIPSE($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'ELLIPSE');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
+			$cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
+			$rx = isset($param['ry']) ? $this->parsingCss->ConvertToMM($param['rx'], $this->_isInDraw['w']) : 0.;
+			$ry = isset($param['rx']) ? $this->parsingCss->ConvertToMM($param['ry'], $this->_isInDraw['h']) : 0.;
+			$this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+
+		/**
+		 * tag : POLYLINE
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_POLYLINE($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$path = isset($param['points']) ? $param['points'] : null;
+			if ($path) {
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+
+				// prepare the path
+				$path = explode(' ', $path);
+				foreach ($path as $k => $v) {
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				$actions = array();
+				for ($k=0; $k<count($path); $k+=2) {
+					$actions[] = array(
+						($k ? 'L' : 'M') ,
+						$this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
+						$this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
+					);
+				}
+
+				// drawing
+				$this->pdf->svgPolygone($actions, $style);
+			}
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : POLYGON
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_POLYGON($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$path = (isset($param['points']) ? $param['points'] : null);
+			if ($path) {
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+
+				// prepare the path
+				$path = explode(' ', $path);
+				foreach ($path as $k => $v) {
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				$actions = array();
+				for ($k=0; $k<count($path); $k+=2) {
+					$actions[] = array(
+						($k ? 'L' : 'M') ,
+						$this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
+						$this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
+					);
+				}
+				$actions[] = array('z');
+
+				// drawing
+				$this->pdf->svgPolygone($actions, $style);
+			}
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : PATH
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_PATH($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'PATH');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+
+			$path = isset($param['d']) ? $param['d'] : null;
+
+			if ($path) {
+				// prepare the path
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path);
+				$path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+				$path = preg_replace('/ ([a-z]{2})/', '$1', $path);
+
+				$path = explode(' ', $path);
+				foreach ($path as $k => $v) {
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				// read each actions in the path
+				$actions = array();
+				$action = array();
+				$lastAction = null; // last action found
+				for ($k=0; $k<count($path);true) {
+
+					// for this actions, we can not have multi coordonate
+					if (in_array($lastAction, array('z', 'Z'))) {
+						$lastAction = null;
+					}
+
+					// read the new action (forcing if no action before)
+					if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction===null) {
+						$lastAction = $path[$k];
+						$k++;
+					}
+
+					// current action
+					$action = array();
+					$action[] = $lastAction;
+					switch($lastAction)
+					{
+						case 'C':
+						case 'c':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x1
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y1
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x2
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y2
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+4], $this->_isInDraw['w']);    // x
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['h']);    // y
+							$k+= 6;
+							break;
+
+						case 'Q':
+						case 'S':
+						case 'q':
+						case 's':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x2
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y2
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y
+							$k+= 4;
+							break;
+
+						case 'A':
+						case 'a':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // rx
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // ry
+							$action[] = 1.*$path[$k+2];                                                        // angle de deviation de l'axe X
+							$action[] = ($path[$k+3]=='1') ? 1 : 0;                                            // large-arc-flag
+							$action[] = ($path[$k+4]=='1') ? 1 : 0;                                            // sweep-flag
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['w']);    // x
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+6], $this->_isInDraw['h']);    // y
+							$k+= 7;
+							break;
+
+						case 'M':
+						case 'L':
+						case 'T':
+						case 'm':
+						case 'l':
+						case 't':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y
+							$k+= 2;
+							break;
+
+						case 'H':
+						case 'h':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
+							$k+= 1;
+							break;
+
+						case 'V':
+						case 'v':
+							$action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['h']);    // y
+							$k+= 1;
+							break;
+
+						case 'z':
+						case 'Z':
+						default:
+							break;
+					}
+					// add the action
+					$actions[] = $action;
+				}
+
+				// drawing
+				$this->pdf->svgPolygone($actions, $style);
+			}
+
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * tag : G
+		 * mode : OPEN
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_open_G($param)
+		{
+			if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'G');
+
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->parsingCss->save();
+			$styles = $this->parsingCss->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+		}
+
+		/**
+		 * tag : G
+		 * mode : CLOSE
+		 *
+		 * @param  array $param
+		 * @return boolean
+		 */
+		protected function _tag_close_G($param)
+		{
+			$this->pdf->undoTransform();
+			$this->parsingCss->load();
+		}
+
+		/**
+		 * new page for the automatic Index, does not use thie method. Only HTML2PDF_myPdf could use it !!!!
+		 *
+		 * @param  &int $page
+		 * @return integer $oldPage
+		 */
+		public function _INDEX_NewPage(&$page)
+		{
+			if ($page) {
+				$oldPage = $this->pdf->getPage();
+				$this->pdf->setPage($page);
+				$this->pdf->setXY($this->_margeLeft, $this->_margeTop);
+				$this->_maxH = 0;
+				$page++;
+				return $oldPage;
+			} else {
+				$this->_setNewPage();
+				return null;
+			}
+		}
+
+	}
 }
\ No newline at end of file

Spacing +917 added lines, -917 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - main class
  *
@@ -14,11 +14,11 @@ 
     define('__CLASS_HTML2PDF__', '4.03');
     define('HTML2PDF_USED_TCPDF_VERSION', '5.0.002');
 
-    require_once(dirname(__FILE__).'/_class/exception.class.php');
-    require_once(dirname(__FILE__).'/_class/locale.class.php');
-    require_once(dirname(__FILE__).'/_class/myPdf.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingHtml.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingCss.class.php');
+    require_once(dirname(__FILE__) . '/_class/exception.class.php');
+    require_once(dirname(__FILE__) . '/_class/locale.class.php');
+    require_once(dirname(__FILE__) . '/_class/myPdf.class.php');
+    require_once(dirname(__FILE__) . '/_class/parsingHtml.class.php');
+    require_once(dirname(__FILE__) . '/_class/parsingCss.class.php');
 
     class HTML2PDF
     {
@@ -40,77 +40,77 @@ 
          */
         public $parsingHtml = null;
 
-        protected $_langue           = 'fr';        // locale of the messages
-        protected $_orientation      = 'P';         // page orientation : Portrait ou Landscape
-        protected $_format           = 'A4';        // page format : A4, A3, ...
-        protected $_encoding         = '';          // charset encoding
-        protected $_unicode          = true;        // means that the input text is unicode (default = true)
-
-        protected $_testTdInOnepage  = true;        // test of TD that can not take more than one page
-        protected $_testIsImage      = true;        // test if the images exist or not
-        protected $_testIsDeprecated = false;       // test the deprecated functions
-
-        protected $_parsePos         = 0;           // position in the parsing
-        protected $_tempPos          = 0;           // temporary position for complex table
-        protected $_page             = 0;           // current page number
-
-        protected $_subHtml          = null;        // sub html
-        protected $_subPart          = false;       // sub HTML2PDF
-        protected $_subHEADER        = array();     // sub action to make the header
-        protected $_subFOOTER        = array();     // sub action to make the footer
-        protected $_subSTATES        = array();     // array to save some parameters
-
-        protected $_isSubPart        = false;       // flag : in a sub html2pdf
-        protected $_isInThead        = false;       // flag : in a thead
-        protected $_isInTfoot        = false;       // flag : in a tfoot
-        protected $_isInOverflow     = false;       // flag : in a overflow
-        protected $_isInFooter       = false;       // flag : in a footer
-        protected $_isInDraw         = null;        // flag : in a draw (svg)
-        protected $_isAfterFloat     = false;       // flag : is just after a float
-        protected $_isInForm         = false;       // flag : is in a float. false / action of the form
-        protected $_isInLink         = '';          // flag : is in a link. empty / href of the link
-        protected $_isInParagraph    = false;       // flag : is in a paragraph
-        protected $_isForOneLine     = false;       // flag : in a specific sub html2pdf to have the height of the next line
-
-        protected $_maxX             = 0;           // maximum X of the current zone
-        protected $_maxY             = 0;           // maximum Y of the current zone
-        protected $_maxE             = 0;           // number of elements in the current zone
-        protected $_maxH             = 0;           // maximum height of the line in the current zone
-        protected $_maxSave          = array();     // save the maximums of the current zone
-        protected $_currentH         = 0;           // height of the current line
-
-        protected $_defaultLeft      = 0;           // default marges of the page
+        protected $_langue           = 'fr'; // locale of the messages
+        protected $_orientation      = 'P'; // page orientation : Portrait ou Landscape
+        protected $_format           = 'A4'; // page format : A4, A3, ...
+        protected $_encoding         = ''; // charset encoding
+        protected $_unicode          = true; // means that the input text is unicode (default = true)
+
+        protected $_testTdInOnepage  = true; // test of TD that can not take more than one page
+        protected $_testIsImage      = true; // test if the images exist or not
+        protected $_testIsDeprecated = false; // test the deprecated functions
+
+        protected $_parsePos         = 0; // position in the parsing
+        protected $_tempPos          = 0; // temporary position for complex table
+        protected $_page             = 0; // current page number
+
+        protected $_subHtml          = null; // sub html
+        protected $_subPart          = false; // sub HTML2PDF
+        protected $_subHEADER        = array(); // sub action to make the header
+        protected $_subFOOTER        = array(); // sub action to make the footer
+        protected $_subSTATES        = array(); // array to save some parameters
+
+        protected $_isSubPart        = false; // flag : in a sub html2pdf
+        protected $_isInThead        = false; // flag : in a thead
+        protected $_isInTfoot        = false; // flag : in a tfoot
+        protected $_isInOverflow     = false; // flag : in a overflow
+        protected $_isInFooter       = false; // flag : in a footer
+        protected $_isInDraw         = null; // flag : in a draw (svg)
+        protected $_isAfterFloat     = false; // flag : is just after a float
+        protected $_isInForm         = false; // flag : is in a float. false / action of the form
+        protected $_isInLink         = ''; // flag : is in a link. empty / href of the link
+        protected $_isInParagraph    = false; // flag : is in a paragraph
+        protected $_isForOneLine     = false; // flag : in a specific sub html2pdf to have the height of the next line
+
+        protected $_maxX             = 0; // maximum X of the current zone
+        protected $_maxY             = 0; // maximum Y of the current zone
+        protected $_maxE             = 0; // number of elements in the current zone
+        protected $_maxH             = 0; // maximum height of the line in the current zone
+        protected $_maxSave          = array(); // save the maximums of the current zone
+        protected $_currentH         = 0; // height of the current line
+
+        protected $_defaultLeft      = 0; // default marges of the page
         protected $_defaultTop       = 0;
         protected $_defaultRight     = 0;
         protected $_defaultBottom    = 0;
-        protected $_defaultFont      = null;        // default font to use, is the asked font does not exist
+        protected $_defaultFont      = null; // default font to use, is the asked font does not exist
 
-        protected $_margeLeft        = 0;           // current marges of the page
+        protected $_margeLeft        = 0; // current marges of the page
         protected $_margeTop         = 0;
         protected $_margeRight       = 0;
         protected $_margeBottom      = 0;
-        protected $_marges           = array();     // save the different marges of the current page
-        protected $_pageMarges       = array();     // float marges of the current page
-        protected $_background       = array();     // background informations
+        protected $_marges           = array(); // save the different marges of the current page
+        protected $_pageMarges       = array(); // float marges of the current page
+        protected $_background       = array(); // background informations
 
 
-        protected $_firstPage        = true;        // flag : first page
-        protected $_defList          = array();     // table to save the stats of the tags UL and OL
+        protected $_firstPage        = true; // flag : first page
+        protected $_defList          = array(); // table to save the stats of the tags UL and OL
 
-        protected $_lstAnchor        = array();     // list of the anchors
-        protected $_lstField         = array();     // list of the fields
-        protected $_lstSelect        = array();     // list of the options of the current select
-        protected $_previousCall     = null;        // last action called
+        protected $_lstAnchor        = array(); // list of the anchors
+        protected $_lstField         = array(); // list of the fields
+        protected $_lstSelect        = array(); // list of the options of the current select
+        protected $_previousCall     = null; // last action called
 
-        protected $_debugActif       = false;       // flag : mode debug is active
-        protected $_debugOkUsage     = false;       // flag : the function memory_get_usage exist
-        protected $_debugOkPeak      = false;       // flag : the function memory_get_peak_usage exist
-        protected $_debugLevel       = 0;           // level in the debug
-        protected $_debugStartTime   = 0;           // debug start time
-        protected $_debugLastTime    = 0;           // debug stop time
+        protected $_debugActif       = false; // flag : mode debug is active
+        protected $_debugOkUsage     = false; // flag : the function memory_get_usage exist
+        protected $_debugOkPeak      = false; // flag : the function memory_get_peak_usage exist
+        protected $_debugLevel       = 0; // level in the debug
+        protected $_debugStartTime   = 0; // debug start time
+        protected $_debugLastTime    = 0; // debug stop time
 
-        static protected $_subobj    = null;        // object html2pdf prepared in order to accelerate the creation of sub html2pdf
-        static protected $_tables    = array();     // static table to prepare the nested html tables
+        static protected $_subobj    = null; // object html2pdf prepared in order to accelerate the creation of sub html2pdf
+        static protected $_tables    = array(); // static table to prepare the nested html tables
 
         /**
          * class constructor
@@ -124,7 +124,7 @@ 
          * @param  array    $marges      Default marges (left, top, right, bottom)
          * @return HTML2PDF $this
          */
-        public function __construct($orientation = 'P', $format = 'A4', $langue='fr', $unicode=true, $encoding='UTF-8', $marges = array(5, 5, 5, 8))
+        public function __construct($orientation = 'P', $format = 'A4', $langue = 'fr', $unicode = true, $encoding = 'UTF-8', $marges = array(5, 5, 5, 8))
         {
             // init the page number
             $this->_page         = 0;
@@ -286,7 +286,7 @@ 
          * @return HTML2PDF $this
          * @see TCPDF::addFont
          */
-        public function addFont($family, $style='', $file='')
+        public function addFont($family, $style = '', $file = '')
         {
             $this->pdf->AddFont($family, $style, $file);
 
@@ -356,18 +356,18 @@ 
             }
 
             // complete parameters
-            if ($dest===false) $dest = 'I';
-            if ($dest===true)  $dest = 'S';
-            if ($dest==='')    $dest = 'I';
-            if ($name=='')     $name='document.pdf';
+            if ($dest === false) $dest = 'I';
+            if ($dest === true)  $dest = 'S';
+            if ($dest === '')    $dest = 'I';
+            if ($name == '')     $name = 'document.pdf';
 
             // clean up the destination
             $dest = strtoupper($dest);
-            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
+            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI', 'FD'))) $dest = 'I';
 
             // the name must be a PDF name
-            if (strtolower(substr($name, -4))!='.pdf') {
-                throw new HTML2PDF_exception(0, 'The output document name "'.$name.'" is not a PDF name');
+            if (strtolower(substr($name, -4)) != '.pdf') {
+                throw new HTML2PDF_exception(0, 'The output document name "' . $name . '" is not a PDF name');
             }
 
             // call the output of TCPDF
@@ -422,20 +422,20 @@ 
 
             // extract the content
             $res = explode('<body', $html);
-            if (count($res)<2) return $html;
-            $content = '<page'.$res[1];
+            if (count($res) < 2) return $html;
+            $content = '<page' . $res[1];
             $content = explode('</body', $content);
-            $content = $content[0].'</page>';
+            $content = $content[0] . '</page>';
 
             // extract the link tags
             preg_match_all('/<link([^>]*)>/isU', $html, $match);
             foreach ($match[0] as $src)
-                $content = $src.'</link>'.$content;
+                $content = $src . '</link>' . $content;
 
             // extract the css style tags
             preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
             foreach ($match[0] as $src)
-                $content = $src.$content;
+                $content = $src . $content;
 
             return $content;
         }
@@ -458,7 +458,7 @@ 
 
             $this->parsingCss->setOnlyLeft();
 
-            $this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup!==null));
+            $this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup !== null));
 
             $this->_saveMargin(0, 0, $marge);
             $this->_defList = $defLIST;
@@ -478,9 +478,9 @@ 
          */
         protected function _vueHTML($content)
         {
-            $content = preg_replace('/<page_header([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue01').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page_footer([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue02').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue03').' : $1<hr><div$1>', $content);
+            $content = preg_replace('/<page_header([^>]*)>/isU', '<hr>' . HTML2PDF_locale::get('vue01') . ' : $1<hr><div$1>', $content);
+            $content = preg_replace('/<page_footer([^>]*)>/isU', '<hr>' . HTML2PDF_locale::get('vue02') . ' : $1<hr><div$1>', $content);
+            $content = preg_replace('/<page([^>]*)>/isU', '<hr>' . HTML2PDF_locale::get('vue03') . ' : $1<hr><div$1>', $content);
             $content = preg_replace('/<\/page([^>]*)>/isU', '</div><hr>', $content);
             $content = preg_replace('/<bookmark([^>]*)>/isU', '<hr>bookmark : $1<hr>', $content);
             $content = preg_replace('/<\/bookmark([^>]*)>/isU', '', $content);
@@ -492,11 +492,11 @@ 
             echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <title>'.HTML2PDF_locale::get('vue04').' HTML</title>
-        <meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'" >
+        <title>'.HTML2PDF_locale::get('vue04') . ' HTML</title>
+        <meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding . '" >
     </head>
     <body style="padding: 10px; font-size: 10pt;font-family:    Verdana;">
-'.$content.'
+'.$content . '
     </body>
 </html>';
             exit;
@@ -513,13 +513,13 @@ 
          */
         protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
         {
-            if ($right===null)  $right = $left;
-            if ($bottom===null) $bottom = 8;
+            if ($right === null)  $right = $left;
+            if ($bottom === null) $bottom = 8;
 
-            $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
-            $this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
-            $this->_defaultRight  = $this->parsingCss->ConvertToMM($right.'mm');
-            $this->_defaultBottom = $this->parsingCss->ConvertToMM($bottom.'mm');
+            $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left . 'mm');
+            $this->_defaultTop    = $this->parsingCss->ConvertToMM($top . 'mm');
+            $this->_defaultRight  = $this->parsingCss->ConvertToMM($right . 'mm');
+            $this->_defaultBottom = $this->parsingCss->ConvertToMM($bottom . 'mm');
         }
 
         /**
@@ -532,13 +532,13 @@ 
          * @param  integer $curr real position in the html parseur (if break line in the write of a text)
          * @param  boolean $resetPageNumber
          */
-        protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber=false)
+        protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber = false)
         {
             $this->_firstPage = false;
 
             $this->_format = $format ? $format : $this->_format;
             $this->_orientation = $orientation ? $orientation : $this->_orientation;
-            $this->_background = $background!==null ? $background : $this->_background;
+            $this->_background = $background !== null ? $background : $this->_background;
             $this->_maxY = 0;
             $this->_maxX = 0;
             $this->_maxH = 0;
@@ -588,9 +588,9 @@ 
         protected function _setMargins()
         {
             // prepare the margins
-            $this->_margeLeft   = $this->_defaultLeft   + (isset($this->_background['left'])   ? $this->_background['left']   : 0);
-            $this->_margeRight  = $this->_defaultRight  + (isset($this->_background['right'])  ? $this->_background['right']  : 0);
-            $this->_margeTop    = $this->_defaultTop    + (isset($this->_background['top'])    ? $this->_background['top']    : 0);
+            $this->_margeLeft   = $this->_defaultLeft + (isset($this->_background['left']) ? $this->_background['left'] : 0);
+            $this->_margeRight  = $this->_defaultRight + (isset($this->_background['right']) ? $this->_background['right'] : 0);
+            $this->_margeTop    = $this->_defaultTop + (isset($this->_background['top']) ? $this->_background['top'] : 0);
             $this->_margeBottom = $this->_defaultBottom + (isset($this->_background['bottom']) ? $this->_background['bottom'] : 0);
 
             // set the PDF margins
@@ -599,10 +599,10 @@ 
 
             // set the float Margins
             $this->_pageMarges = array();
-            if ($this->_isInParagraph!==false) {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_isInParagraph[0], $this->pdf->getW()-$this->_isInParagraph[1]);
+            if ($this->_isInParagraph !== false) {
+                $this->_pageMarges[floor($this->_margeTop * 100)] = array($this->_isInParagraph[0], $this->pdf->getW() - $this->_isInParagraph[1]);
             } else {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_margeLeft, $this->pdf->getW()-$this->_margeRight);
+                $this->_pageMarges[floor($this->_margeTop * 100)] = array($this->_margeLeft, $this->pdf->getW() - $this->_margeRight);
             }
         }
 
@@ -614,28 +614,28 @@ 
          * @param  boolean $level (true=up, false=down, null=nothing to do)
          * @return $this
          */
-        protected function _DEBUG_add($name, $level=null)
+        protected function _DEBUG_add($name, $level = null)
         {
             // if true : UP
-            if ($level===true) $this->_debugLevel++;
+            if ($level === true) $this->_debugLevel++;
 
-            $name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
+            $name = str_repeat('  ', $this->_debugLevel) . $name . ($level === true ? ' Begin' : ($level === false ? ' End' : ''));
             $time  = microtime(true);
             $usage = ($this->_debugOkUsage ? memory_get_usage() : 0);
             $peak  = ($this->_debugOkPeak ? memory_get_peak_usage() : 0);
 
             $this->_DEBUG_stepline(
                 $name,
-                number_format(($time - $this->_debugStartTime)*1000, 1, '.', ' ').' ms',
-                number_format(($time - $this->_debugLastTime)*1000, 1, '.', ' ').' ms',
-                number_format($usage/1024, 1, '.', ' ').' Ko',
-                number_format($peak/1024, 1, '.', ' ').' Ko'
+                number_format(($time - $this->_debugStartTime) * 1000, 1, '.', ' ') . ' ms',
+                number_format(($time - $this->_debugLastTime) * 1000, 1, '.', ' ') . ' ms',
+                number_format($usage / 1024, 1, '.', ' ') . ' Ko',
+                number_format($peak / 1024, 1, '.', ' ') . ' Ko'
             );
 
             $this->_debugLastTime = $time;
 
             // it false : DOWN
-            if ($level===false) $this->_debugLevel--;
+            if ($level === false) $this->_debugLevel--;
 
             return $this;
         }
@@ -653,13 +653,13 @@ 
          */
         protected function _DEBUG_stepline($name, $timeTotal, $timeStep, $memoryUsage, $memoryPeak)
         {
-            $txt = str_pad($name, 30, ' ', STR_PAD_RIGHT).
-                    str_pad($timeTotal, 12, ' ', STR_PAD_LEFT).
-                    str_pad($timeStep, 12, ' ', STR_PAD_LEFT).
-                    str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT).
+            $txt = str_pad($name, 30, ' ', STR_PAD_RIGHT) .
+                    str_pad($timeTotal, 12, ' ', STR_PAD_LEFT) .
+                    str_pad($timeStep, 12, ' ', STR_PAD_LEFT) .
+                    str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT) .
                     str_pad($memoryPeak, 15, ' ', STR_PAD_LEFT);
 
-            echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
+            echo '<pre style="padding:0; margin:0">' . $txt . '</pre>';
         }
 
         /**
@@ -671,11 +671,11 @@ 
          */
         protected function _getMargins($y)
         {
-            $y = floor($y*100);
-            $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
+            $y = floor($y * 100);
+            $x = array($this->pdf->getlMargin(), $this->pdf->getW() - $this->pdf->getrMargin());
 
             foreach ($this->_pageMarges as $mY => $mX)
-                if ($mY<=$y) $x = $mX;
+                if ($mY <= $y) $x = $mX;
 
             return $x;
         }
@@ -697,18 +697,18 @@ 
             $oldBottom = $this->_getMargins($yBottom);
 
             // update the top float margin
-            if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
-            if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
+            if ($float == 'left' && $oldTop[0] < $xRight) $oldTop[0] = $xRight;
+            if ($float == 'right' && $oldTop[1] > $xLeft)  $oldTop[1] = $xLeft;
 
-            $yTop = floor($yTop*100);
-            $yBottom = floor($yBottom*100);
+            $yTop = floor($yTop * 100);
+            $yBottom = floor($yBottom * 100);
 
             // erase all the float margins that are smaller than the new one
             foreach ($this->_pageMarges as $mY => $mX) {
-                if ($mY<$yTop) continue;
-                if ($mY>$yBottom) break;
-                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
-                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
+                if ($mY < $yTop) continue;
+                if ($mY > $yBottom) break;
+                if ($float == 'left' && $this->_pageMarges[$mY][0] < $xRight)  unset($this->_pageMarges[$mY]);
+                if ($float == 'right' && $this->_pageMarges[$mY][1] > $xLeft) unset($this->_pageMarges[$mY]);
             }
 
             // save the new Top and Bottom margins
@@ -740,7 +740,7 @@ 
 
             // prepare for float margins
             $this->_pageMarges = array();
-            $this->_pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
+            $this->_pageMarges[floor($mt * 100)] = array($ml, $this->pdf->getW() - $mr);
         }
 
         /**
@@ -760,7 +760,7 @@ 
                 $ml = $this->_margeLeft;
                 $mt = 0;
                 $mr = $this->_margeRight;
-                $mP = array($mt => array($ml, $this->pdf->getW()-$mr));
+                $mP = array($mt => array($ml, $this->pdf->getW() - $mr));
             }
 
             $this->pdf->SetMargins($ml, $mt, $mr);
@@ -865,7 +865,7 @@ 
             // get the margins for the current line
             list($lx, $rx) = $this->_getMargins($this->pdf->getY());
             $this->pdf->setX($lx);
-            $wMax = $rx-$lx;
+            $wMax = $rx - $lx;
             $this->_currentH = 0;
 
             // if subPart => return because align left
@@ -877,22 +877,22 @@ 
             // create the sub object
             $sub = null;
             $this->_createSubHTML($sub);
-            $sub->_saveMargin(0, 0, $sub->pdf->getW()-$wMax);
+            $sub->_saveMargin(0, 0, $sub->pdf->getW() - $wMax);
             $sub->_isForOneLine = true;
             $sub->_parsePos = $this->_parsePos;
             $sub->parsingHtml->code = $this->parsingHtml->code;
 
             // if $curr => adapt the current position of the parsing
-            if ($curr!==null && $sub->parsingHtml->code[$this->_parsePos]['name']=='write') {
+            if ($curr !== null && $sub->parsingHtml->code[$this->_parsePos]['name'] == 'write') {
                 $txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
                 $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
-                $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
+                $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr + 1);
             } else
                 $sub->_parsePos++;
 
             // for each element of the parsing => load the action
             $res = null;
-            for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
+            for ($sub->_parsePos; $sub->_parsePos < count($sub->parsingHtml->code); $sub->_parsePos++) {
                 $action = $sub->parsingHtml->code[$sub->_parsePos];
                 $res = $sub->_executeAction($action);
                 if (!$res) break;
@@ -900,16 +900,16 @@ 
 
             $w = $sub->_maxX; // max width
             $h = $sub->_maxH; // max height
-            $e = ($res===null ? $sub->_maxE : 0); // maxnumber of elemets on the line
+            $e = ($res === null ? $sub->_maxE : 0); // maxnumber of elemets on the line
 
             // destroy the sub HTML
             $this->_destroySubHTML($sub);
 
             // adapt the start of the line, depending on the text-align
-            if ($this->parsingCss->value['text-align']=='center')
-                $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-            else if ($this->parsingCss->value['text-align']=='right')
-                $this->pdf->setX($rx-$w-0.01);
+            if ($this->parsingCss->value['text-align'] == 'center')
+                $this->pdf->setX(($rx + $this->pdf->getX() - $w) * 0.5 - 0.01);
+            else if ($this->parsingCss->value['text-align'] == 'right')
+                $this->pdf->setX($rx - $w - 0.01);
             else
                 $this->pdf->setX($lx);
 
@@ -917,8 +917,8 @@ 
             $this->_currentH = $h;
 
             // if justify => set the word spacing
-            if ($this->parsingCss->value['text-align']=='justify' && $e>1) {
-                $this->pdf->setWordSpacing(($wMax-$w)/($e-1));
+            if ($this->parsingCss->value['text-align'] == 'justify' && $e > 1) {
+                $this->pdf->setWordSpacing(($wMax - $w) / ($e - 1));
             } else {
                 $this->pdf->setWordSpacing(0);
             }
@@ -940,7 +940,7 @@ 
                                         $this->_langue,
                                         $this->_unicode,
                                         $this->_encoding,
-                                        array($this->_defaultLeft,$this->_defaultTop,$this->_defaultRight,$this->_defaultBottom)
+                                        array($this->_defaultLeft, $this->_defaultTop, $this->_defaultRight, $this->_defaultBottom)
                                     );
 
             // init
@@ -965,21 +965,21 @@ 
          * @param  &HTML2PDF $subHtml sub HTML2PDF to create
          * @param  integer   $cellmargin if in a TD : cellmargin of this td
          */
-        protected function _createSubHTML(&$subHtml, $cellmargin=0)
+        protected function _createSubHTML(&$subHtml, $cellmargin = 0)
         {
             // prepare the subObject, if never prepare before
-            if (HTML2PDF::$_subobj===null) {
+            if (HTML2PDF::$_subobj === null) {
                 $this->_prepareSubObj();
             }
 
             // calculate the width to use
             if ($this->parsingCss->value['width']) {
-                $marge = $cellmargin*2;
-                $marge+= $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
-                $marge+= $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
+                $marge = $cellmargin * 2;
+                $marge += $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
+                $marge += $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
                 $marge = $this->pdf->getW() - $this->parsingCss->value['width'] + $marge;
             } else {
-                $marge = $this->_margeLeft+$this->_margeRight;
+                $marge = $this->_margeLeft + $this->_margeRight;
             }
 
             // BUGFIX : we have to call the method, because of a bug in php 5.1.6
@@ -1020,29 +1020,29 @@ 
          */
         protected function _listeArab2Rom($nbArabic)
         {
-            $nbBaseTen    = array('I','X','C','M');
-            $nbBaseFive    = array('V','L','D');
-            $nbRoman    = '';
+            $nbBaseTen = array('I', 'X', 'C', 'M');
+            $nbBaseFive = array('V', 'L', 'D');
+            $nbRoman = '';
 
-            if ($nbArabic<1)    return $nbArabic;
-            if ($nbArabic>3999) return $nbArabic;
+            if ($nbArabic < 1)    return $nbArabic;
+            if ($nbArabic > 3999) return $nbArabic;
 
-            for ($i=3; $i>=0 ; $i--) {
-                $chiffre=floor($nbArabic/pow(10, $i));
-                if ($chiffre>=1) {
-                    $nbArabic=$nbArabic-$chiffre*pow(10, $i);
-                    if ($chiffre<=3) {
-                        for ($j=$chiffre; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
+            for ($i = 3; $i >= 0; $i--) {
+                $chiffre = floor($nbArabic / pow(10, $i));
+                if ($chiffre >= 1) {
+                    $nbArabic = $nbArabic - $chiffre * pow(10, $i);
+                    if ($chiffre <= 3) {
+                        for ($j = $chiffre; $j >= 1; $j--) {
+                            $nbRoman = $nbRoman . $nbBaseTen[$i];
                         }
-                    } else if ($chiffre==9) {
-                        $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseTen[$i+1];
-                    } else if ($chiffre==4) {
-                    $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseFive[$i];
+                    } else if ($chiffre == 9) {
+                        $nbRoman = $nbRoman . $nbBaseTen[$i] . $nbBaseTen[$i + 1];
+                    } else if ($chiffre == 4) {
+                    $nbRoman = $nbRoman . $nbBaseTen[$i] . $nbBaseFive[$i];
                     } else {
-                        $nbRoman=$nbRoman.$nbBaseFive[$i];
-                        for ($j=$chiffre-5; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
+                        $nbRoman = $nbRoman . $nbBaseFive[$i];
+                        for ($j = $chiffre - 5; $j >= 1; $j--) {
+                            $nbRoman = $nbRoman . $nbBaseTen[$i];
                         }
                     }
                 }
@@ -1057,7 +1057,7 @@ 
          */
         protected function _listeAddLi()
         {
-            $this->_defList[count($this->_defList)-1]['nb']++;
+            $this->_defList[count($this->_defList) - 1]['nb']++;
         }
 
         /**
@@ -1090,14 +1090,14 @@ 
          */
         protected function _listeGetLi()
         {
-            $im = $this->_defList[count($this->_defList)-1]['img'];
-            $st = $this->_defList[count($this->_defList)-1]['style'];
-            $nb = $this->_defList[count($this->_defList)-1]['nb'];
-            $up = (substr($st, 0, 6)=='upper-');
+            $im = $this->_defList[count($this->_defList) - 1]['img'];
+            $st = $this->_defList[count($this->_defList) - 1]['style'];
+            $nb = $this->_defList[count($this->_defList) - 1]['nb'];
+            $up = (substr($st, 0, 6) == 'upper-');
 
             if ($im) return array(false, false, $im);
 
-            switch($st)
+            switch ($st)
             {
                 case 'none':
                     return array('helvetica', true, ' ');
@@ -1105,22 +1105,22 @@ 
                 case 'upper-alpha':
                 case 'lower-alpha':
                     $str = '';
-                    while ($nb>26) {
-                        $str = chr(96+$nb%26).$str;
-                        $nb = floor($nb/26);
+                    while ($nb > 26) {
+                        $str = chr(96 + $nb % 26) . $str;
+                        $nb = floor($nb / 26);
                     }
-                    $str = chr(96+$nb).$str;
+                    $str = chr(96 + $nb) . $str;
 
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+                    return array('helvetica', false, ($up ? strtoupper($str) : $str) . '.');
 
                 case 'upper-roman':
                 case 'lower-roman':
                     $str = $this->_listeArab2Rom($nb);
 
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+                    return array('helvetica', false, ($up ? strtoupper($str) : $str) . '.');
 
                 case 'decimal':
-                    return array('helvetica', false, $nb.'.');
+                    return array('helvetica', false, $nb . '.');
 
                 case 'square':
                     return array('zapfdingbats', true, chr(110));
@@ -1160,7 +1160,7 @@ 
             if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
 
             if (!$style) {
-                if ($type=='ul')    $style = 'disc';
+                if ($type == 'ul')    $style = 'disc';
                 else                $style = 'decimal';
             }
 
@@ -1176,7 +1176,7 @@ 
         protected function _listeDelLevel()
         {
             if (count($this->_defList)) {
-                unset($this->_defList[count($this->_defList)-1]);
+                unset($this->_defList[count($this->_defList) - 1]);
                 $this->_defList = array_values($this->_defList);
             }
         }
@@ -1189,7 +1189,7 @@ 
         protected function _makeHTMLcode()
         {
             // foreach elements of the parsing
-            for ($this->_parsePos=0; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+            for ($this->_parsePos = 0; $this->_parsePos < count($this->parsingHtml->code); $this->_parsePos++) {
 
                 // get the action to do
                 $action = $this->parsingHtml->code[$this->_parsePos];
@@ -1207,7 +1207,7 @@ 
                     $this->_tempPos = $this->_parsePos;
 
                     // foreach elements, while we are in the opened tag
-                    while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]['name']==$tagOpen && $this->parsingHtml->code[$this->_tempPos]['close'])) {
+                    while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]['name'] == $tagOpen && $this->parsingHtml->code[$this->_tempPos]['close'])) {
                         // make the action
                         $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
                         $this->_tempPos++;
@@ -1236,13 +1236,13 @@ 
         protected function _executeAction($action)
         {
             // name of the action
-            $fnc = ($action['close'] ? '_tag_close_' : '_tag_open_').strtoupper($action['name']);
+            $fnc = ($action['close'] ? '_tag_close_' : '_tag_open_') . strtoupper($action['name']);
 
             // parameters of the action
             $param = $action['param'];
 
             // if it the first action of the first page, and if it is not a open tag of PAGE => create the new page
-            if ($fnc!='_tag_open_PAGE' && $this->_firstPage) {
+            if ($fnc != '_tag_open_PAGE' && $this->_firstPage) {
                 $this->_setNewPage();
             }
 
@@ -1270,10 +1270,10 @@ 
          */
         protected function _getElementY($h)
         {
-            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
+            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH < $h)
                 return 0;
 
-            return ($this->_currentH-$h)*0.8;
+            return ($this->_currentH - $h) * 0.8;
         }
 
         /**
@@ -1286,7 +1286,7 @@ 
         protected function _makeBreakLine($h, $curr = null)
         {
             if ($h) {
-                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
+                if (($this->pdf->getY() + $h < $this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
                     $this->_setNewLine($h, $curr);
                 else
                     $this->_setNewPage(null, '', null, $curr);
@@ -1306,14 +1306,14 @@ 
          * @param  boolean $subLi if true=image of a list
          * @return boolean depending on "isForOneLine"
          */
-        protected function _drawImage($src, $subLi=false)
+        protected function _drawImage($src, $subLi = false)
         {
             // get the size of the image
             // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-            $infos=@getimagesize($src);
+            $infos = @getimagesize($src);
 
             // if the image does not exist, or can not be loaded
-            if (count($infos)<2) {
+            if (count($infos) < 2) {
                 // if the test is activ => exception
                 if ($this->_testIsImage) {
                     throw new HTML2PDF_exception(6, $src);
@@ -1325,8 +1325,8 @@ 
             }
 
             // convert the size of the image in the unit of the PDF
-            $imageWidth = $infos[0]/$this->pdf->getK();
-            $imageHeight = $infos[1]/$this->pdf->getK();
+            $imageWidth = $infos[0] / $this->pdf->getK();
+            $imageHeight = $infos[1] / $this->pdf->getK();
 
             // calculate the size from the css style
             if ($this->parsingCss->value['width'] && $this->parsingCss->value['height']) {
@@ -1334,14 +1334,14 @@ 
                 $h = $this->parsingCss->value['height'];
             } else if ($this->parsingCss->value['width']) {
                 $w = $this->parsingCss->value['width'];
-                $h = $imageHeight*$w/$imageWidth;
+                $h = $imageHeight * $w / $imageWidth;
             } else if ($this->parsingCss->value['height']) {
                 $h = $this->parsingCss->value['height'];
-                $w = $imageWidth*$h/$imageHeight;
+                $w = $imageWidth * $h / $imageHeight;
             } else {
                 // convert px to pt
-                $w = 72./96.*$imageWidth;
-                $h = 72./96.*$imageHeight;
+                $w = 72. / 96. * $imageWidth;
+                $h = 72. / 96. * $imageHeight;
             }
 
             // are we in a float
@@ -1360,7 +1360,7 @@ 
             $y = $this->pdf->getY();
 
             // if the image can not be put on the current line => new line
-            if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
+            if (!$float && ($x + $w > $this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
                 if ($this->_isForOneLine) {
                     return false;
                 }
@@ -1375,7 +1375,7 @@ 
             }
 
             // if the image can not be put on the current page
-            if (($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
+            if (($y + $h > $this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
                 // new page
                 $this->_setNewPage();
 
@@ -1385,17 +1385,17 @@ 
             }
 
             // correction for display the image of a list
-            $hT = 0.80*$this->parsingCss->value['font-size'];
-            if ($subLi && $h<$hT) {
-                $y+=($hT-$h);
+            $hT = 0.80 * $this->parsingCss->value['font-size'];
+            if ($subLi && $h < $hT) {
+                $y += ($hT - $h);
             }
 
             // add the margin top
-            $yc = $y-$this->parsingCss->value['margin']['t'];
+            $yc = $y - $this->parsingCss->value['margin']['t'];
 
             // get the width and the position of the parent
             $old = $this->parsingCss->getOldValues();
-            if ( $old['width']) {
+            if ($old['width']) {
                 $parentWidth = $old['width'];
                 $parentX = $x;
             } else {
@@ -1407,12 +1407,12 @@ 
             if ($float) {
                 list($lx, $rx) = $this->_getMargins($yc);
                 $parentX = $lx;
-                $parentWidth = $rx-$lx;
+                $parentWidth = $rx - $lx;
             }
 
             // calculate the position of the image, if align to the right
-            if ($parentWidth>$w && $float!='left') {
-                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+            if ($parentWidth > $w && $float != 'left') {
+                if ($float == 'right' || $this->parsingCss->value['text-align'] == 'li_right')    $x = $parentX + $parentWidth - $w - $this->parsingCss->value['margin']['r'] - $this->parsingCss->value['margin']['l'];
             }
 
             // display the image
@@ -1427,39 +1427,39 @@ 
             }
 
             // apply the margins
-            $x-= $this->parsingCss->value['margin']['l'];
-            $y-= $this->parsingCss->value['margin']['t'];
-            $w+= $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
-            $h+= $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
+            $x -= $this->parsingCss->value['margin']['l'];
+            $y -= $this->parsingCss->value['margin']['t'];
+            $w += $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
+            $h += $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
 
-            if ($float=='left') {
+            if ($float == 'left') {
                 // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
+                $this->_maxX = max($this->_maxX, $x + $w);
+                $this->_maxY = max($this->_maxY, $y + $h);
 
                 // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
+                $this->_addMargins($float, $x, $y, $x + $w, $y + $h);
 
                 // get the new position
                 list($lx, $rx) = $this->_getMargins($yc);
                 $this->pdf->setXY($lx, $yc);
-            } else if ($float=='right') {
+            } else if ($float == 'right') {
                 // save the current max. We don't save the X because it is not the real max of the line
-                $this->_maxY = max($this->_maxY, $y+$h);
+                $this->_maxY = max($this->_maxY, $y + $h);
 
                 // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
+                $this->_addMargins($float, $x, $y, $x + $w, $y + $h);
 
                 // get the new position
                 list($lx, $rx) = $this->_getMargins($yc);
                 $this->pdf->setXY($lx, $yc);
             } else {
                 // set the new position at the end of the image
-                $this->pdf->setX($x+$w);
+                $this->pdf->setX($x + $w);
 
                 // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
+                $this->_maxX = max($this->_maxX, $x + $w);
+                $this->_maxY = max($this->_maxY, $y + $h);
                 $this->_maxH = max($this->_maxH, $h);
             }
 
@@ -1483,13 +1483,13 @@ 
         protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
         {
             // if we are in a subpart or if height is null => return false
-            if ($this->_subPart || $this->_isSubPart || $h===null) return false;
+            if ($this->_subPart || $this->_isSubPart || $h === null) return false;
 
             // add the margin
-            $x+= $margin;
-            $y+= $margin;
-            $w-= $margin*2;
-            $h-= $margin*2;
+            $x += $margin;
+            $y += $margin;
+            $w -= $margin * 2;
+            $h -= $margin * 2;
 
             // get the radius of the border
             $outTL = $border['radius']['tl'];
@@ -1510,32 +1510,32 @@ 
             $inBL = $outBL;
 
             if (is_array($inTL)) {
-                $inTL[0]-= $border['l']['width'];
-                $inTL[1]-= $border['t']['width'];
+                $inTL[0] -= $border['l']['width'];
+                $inTL[1] -= $border['t']['width'];
             }
             if (is_array($inTR)) {
-                $inTR[0]-= $border['r']['width'];
-                $inTR[1]-= $border['t']['width'];
+                $inTR[0] -= $border['r']['width'];
+                $inTR[1] -= $border['t']['width'];
             }
             if (is_array($inBR)) {
-                $inBR[0]-= $border['r']['width'];
-                $inBR[1]-= $border['b']['width'];
+                $inBR[0] -= $border['r']['width'];
+                $inBR[1] -= $border['b']['width'];
             }
             if (is_array($inBL)) {
-                $inBL[0]-= $border['l']['width'];
-                $inBL[1]-= $border['b']['width'];
+                $inBL[0] -= $border['l']['width'];
+                $inBL[1] -= $border['b']['width'];
             }
 
-            if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
-            if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
-            if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
-            if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
+            if ($inTL[0] <= 0 || $inTL[1] <= 0) $inTL = null;
+            if ($inTR[0] <= 0 || $inTR[1] <= 0) $inTR = null;
+            if ($inBR[0] <= 0 || $inBR[1] <= 0) $inBR = null;
+            if ($inBL[0] <= 0 || $inBL[1] <= 0) $inBL = null;
 
             // prepare the background color
             $pdfStyle = '';
             if ($background['color']) {
                 $this->pdf->setFillColorArray($background['color']);
-                $pdfStyle.= 'F';
+                $pdfStyle .= 'F';
             }
 
             // if we have a background to fill => fill it with a path (because of the radius)
@@ -1548,8 +1548,8 @@ 
             // prepare the background image
             if ($background['image']) {
                 $iName      = $background['image'];
-                $iPosition  = $background['position']!==null ? $background['position'] : array(0, 0);
-                $iRepeat    = $background['repeat']!==null   ? $background['repeat']   : array(true, true);
+                $iPosition  = $background['position'] !== null ? $background['position'] : array(0, 0);
+                $iRepeat    = $background['repeat'] !== null ? $background['repeat'] : array(true, true);
 
                 // size of the background without the borders
                 $bX = $x;
@@ -1558,76 +1558,76 @@ 
                 $bH = $h;
 
                 if ($border['b']['width']) {
-                    $bH-= $border['b']['width'];
+                    $bH -= $border['b']['width'];
                 }
                 if ($border['l']['width']) {
-                    $bW-= $border['l']['width'];
-                    $bX+= $border['l']['width'];
+                    $bW -= $border['l']['width'];
+                    $bX += $border['l']['width'];
                 }
                 if ($border['t']['width']) {
-                    $bH-= $border['t']['width'];
-                    $bY+= $border['t']['width'];
+                    $bH -= $border['t']['width'];
+                    $bY += $border['t']['width'];
                 }
                 if ($border['r']['width']) {
-                    $bW-= $border['r']['width'];
+                    $bW -= $border['r']['width'];
                 }
 
                 // get the size of the image
                 // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                $imageInfos=@getimagesize($iName);
+                $imageInfos = @getimagesize($iName);
 
                 // if the image can not be loaded
-                if (count($imageInfos)<2) {
+                if (count($imageInfos) < 2) {
                     if ($this->_testIsImage) {
                         throw new HTML2PDF_exception(6, $iName);
                     }
                 } else {
                     // convert the size of the image from pixel to the unit of the PDF
-                    $imageWidth    = 72./96.*$imageInfos[0]/$this->pdf->getK();
-                    $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
+                    $imageWidth = 72. / 96. * $imageInfos[0] / $this->pdf->getK();
+                    $imageHeight = 72. / 96. * $imageInfos[1] / $this->pdf->getK();
 
                     // prepare the position of the backgroung
                     if ($iRepeat[0]) $iPosition[0] = $bX;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                    else $iPosition[0] = $bX+$iPosition[0];
+                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1] * ($bW - $imageWidth) / 100;
+                    else $iPosition[0] = $bX + $iPosition[0];
 
                     if ($iRepeat[1]) $iPosition[1] = $bY;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                    else $iPosition[1] = $bY+$iPosition[1];
+                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1] * ($bH - $imageHeight) / 100;
+                    else $iPosition[1] = $bY + $iPosition[1];
 
                     $imageXmin = $bX;
-                    $imageXmax = $bX+$bW;
+                    $imageXmax = $bX + $bW;
                     $imageYmin = $bY;
-                    $imageYmax = $bY+$bH;
+                    $imageYmax = $bY + $bH;
 
                     if (!$iRepeat[0] && !$iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
+                        $imageXmin = $iPosition[0]; $imageXmax = $iPosition[0] + $imageWidth;
+                        $imageYmin = $iPosition[1]; $imageYmax = $iPosition[1] + $imageHeight;
                     } else if ($iRepeat[0] && !$iRepeat[1]) {
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
+                        $imageYmin = $iPosition[1]; $imageYmax = $iPosition[1] + $imageHeight;
                     } else if (!$iRepeat[0] && $iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
+                        $imageXmin = $iPosition[0]; $imageXmax = $iPosition[0] + $imageWidth;
                     }
 
                     // build the path to display the image (because of radius)
                     $this->pdf->clippingPathStart($bX, $bY, $bW, $bH, $inTL, $inTR, $inBL, $inBR);
 
                     // repeat the image
-                    for ($iY=$imageYmin; $iY<$imageYmax; $iY+=$imageHeight) {
-                        for ($iX=$imageXmin; $iX<$imageXmax; $iX+=$imageWidth) {
+                    for ($iY = $imageYmin; $iY < $imageYmax; $iY += $imageHeight) {
+                        for ($iX = $imageXmin; $iX < $imageXmax; $iX += $imageWidth) {
                             $cX = null;
                             $cY = null;
                             $cW = $imageWidth;
                             $cH = $imageHeight;
-                            if ($imageYmax-$iY<$imageHeight) {
+                            if ($imageYmax - $iY < $imageHeight) {
                                 $cX = $iX;
                                 $cY = $iY;
-                                $cH = $imageYmax-$iY;
+                                $cH = $imageYmax - $iY;
                             }
-                            if ($imageXmax-$iX<$imageWidth) {
+                            if ($imageXmax - $iX < $imageWidth) {
                                 $cX = $iX;
                                 $cY = $iY;
-                                $cW = $imageXmax-$iX;
+                                $cW = $imageXmax - $iX;
                             }
 
                             $this->pdf->Image($iName, $iX, $iY, $imageWidth, $imageHeight, '', '');
@@ -1641,36 +1641,36 @@ 
 
             // adding some loose (0.01mm)
             $loose = 0.01;
-            $x-= $loose;
-            $y-= $loose;
-            $w+= 2.*$loose;
-            $h+= 2.*$loose;
-            if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
-            if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
-            if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
-            if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
+            $x -= $loose;
+            $y -= $loose;
+            $w += 2. * $loose;
+            $h += 2. * $loose;
+            if ($border['l']['width']) $border['l']['width'] += 2. * $loose;
+            if ($border['t']['width']) $border['t']['width'] += 2. * $loose;
+            if ($border['r']['width']) $border['r']['width'] += 2. * $loose;
+            if ($border['b']['width']) $border['b']['width'] += 2. * $loose;
 
             // prepare the test on borders
-            $testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
-            $testBt = ($border['t']['width'] && $border['t']['color'][0]!==null);
-            $testBr = ($border['r']['width'] && $border['r']['color'][0]!==null);
-            $testBb = ($border['b']['width'] && $border['b']['color'][0]!==null);
+            $testBl = ($border['l']['width'] && $border['l']['color'][0] !== null);
+            $testBt = ($border['t']['width'] && $border['t']['color'][0] !== null);
+            $testBr = ($border['r']['width'] && $border['r']['color'][0] !== null);
+            $testBb = ($border['b']['width'] && $border['b']['color'][0] !== null);
 
             // draw the radius bottom-left
             if (is_array($outBL) && ($testBb || $testBl)) {
                 if ($inBL) {
                     $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
+                    $courbe[] = $x + $outBL[0]; $courbe[] = $y + $h;
+                    $courbe[] = $x; $courbe[] = $y + $h - $outBL[1];
+                    $courbe[] = $x + $outBL[0]; $courbe[] = $y + $h - $border['b']['width'];
+                    $courbe[] = $x + $border['l']['width']; $courbe[] = $y + $h - $outBL[1];
+                    $courbe[] = $x + $outBL[0]; $courbe[] = $y + $h - $outBL[1];
                 } else {
                     $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
+                    $courbe[] = $x + $outBL[0]; $courbe[] = $y + $h;
+                    $courbe[] = $x; $courbe[] = $y + $h - $outBL[1];
+                    $courbe[] = $x + $border['l']['width']; $courbe[] = $y + $h - $border['b']['width'];
+                    $courbe[] = $x + $outBL[0]; $courbe[] = $y + $h - $outBL[1];
                 }
                 $this->_drawCurve($courbe, $border['l']['color']);
             }
@@ -1679,17 +1679,17 @@ 
             if (is_array($outTL) && ($testBt || $testBl)) {
                 if ($inTL) {
                     $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
+                    $courbe[] = $x; $courbe[] = $y + $outTL[1];
+                    $courbe[] = $x + $outTL[0]; $courbe[] = $y;
+                    $courbe[] = $x + $border['l']['width']; $courbe[] = $y + $outTL[1];
+                    $courbe[] = $x + $outTL[0]; $courbe[] = $y + $border['t']['width'];
+                    $courbe[] = $x + $outTL[0]; $courbe[] = $y + $outTL[1];
                 } else {
                     $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
+                    $courbe[] = $x; $courbe[] = $y + $outTL[1];
+                    $courbe[] = $x + $outTL[0]; $courbe[] = $y;
+                    $courbe[] = $x + $border['l']['width']; $courbe[] = $y + $border['t']['width'];
+                    $courbe[] = $x + $outTL[0]; $courbe[] = $y + $outTL[1];
                 }
                 $this->_drawCurve($courbe, $border['t']['color']);
             }
@@ -1698,17 +1698,17 @@ 
             if (is_array($outTR) && ($testBt || $testBr)) {
                 if ($inTR) {
                     $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
+                    $courbe[] = $x + $w - $outTR[0]; $courbe[] = $y;
+                    $courbe[] = $x + $w; $courbe[] = $y + $outTR[1];
+                    $courbe[] = $x + $w - $outTR[0]; $courbe[] = $y + $border['t']['width'];
+                    $courbe[] = $x + $w - $border['r']['width']; $courbe[] = $y + $outTR[1];
+                    $courbe[] = $x + $w - $outTR[0]; $courbe[] = $y + $outTR[1];
                 } else {
                     $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
+                    $courbe[] = $x + $w - $outTR[0]; $courbe[] = $y;
+                    $courbe[] = $x + $w; $courbe[] = $y + $outTR[1];
+                    $courbe[] = $x + $w - $border['r']['width']; $courbe[] = $y + $border['t']['width'];
+                    $courbe[] = $x + $w - $outTR[0]; $courbe[] = $y + $outTR[1];
                 }
                 $this->_drawCurve($courbe, $border['r']['color']);
             }
@@ -1717,17 +1717,17 @@ 
             if (is_array($outBR) && ($testBb || $testBr)) {
                 if ($inBR) {
                     $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
+                    $courbe[] = $x + $w; $courbe[] = $y + $h - $outBR[1];
+                    $courbe[] = $x + $w - $outBR[0]; $courbe[] = $y + $h;
+                    $courbe[] = $x + $w - $border['r']['width']; $courbe[] = $y + $h - $outBR[1];
+                    $courbe[] = $x + $w - $outBR[0]; $courbe[] = $y + $h - $border['b']['width'];
+                    $courbe[] = $x + $w - $outBR[0]; $courbe[] = $y + $h - $outBR[1];
                 } else {
                     $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
+                    $courbe[] = $x + $w; $courbe[] = $y + $h - $outBR[1];
+                    $courbe[] = $x + $w - $outBR[0]; $courbe[] = $y + $h;
+                    $courbe[] = $x + $w - $border['r']['width']; $courbe[] = $y + $h - $border['b']['width'];
+                    $courbe[] = $x + $w - $outBR[0]; $courbe[] = $y + $h - $outBR[1];
                 }
                 $this->_drawCurve($courbe, $border['b']['color']);
             }
@@ -1735,25 +1735,25 @@ 
             // draw the left border
             if ($testBl) {
                 $pt = array();
-                $pt[] = $x;                       $pt[] = $y+$h;
-                $pt[] = $x;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x;                       $pt[] = $y;
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$h-$border['b']['width'];
+                $pt[] = $x; $pt[] = $y + $h;
+                $pt[] = $x; $pt[] = $y + $h - $border['b']['width'];
+                $pt[] = $x; $pt[] = $y + $border['t']['width'];
+                $pt[] = $x; $pt[] = $y;
+                $pt[] = $x + $border['l']['width']; $pt[] = $y + $border['t']['width'];
+                $pt[] = $x + $border['l']['width']; $pt[] = $y + $h - $border['b']['width'];
 
                 $bord = 3;
                 if (is_array($outBL)) {
-                    $bord-=1;
+                    $bord -= 1;
                     $pt[3] -= $outBL[1] - $border['b']['width'];
-                    if ($inBL) $pt[11]-= $inBL[1];
-                    unset($pt[0]);unset($pt[1]);
+                    if ($inBL) $pt[11] -= $inBL[1];
+                    unset($pt[0]); unset($pt[1]);
                 }
                 if (is_array($outTL)) {
-                    $bord-=2;
-                    $pt[5] += $outTL[1]-$border['t']['width'];
+                    $bord -= 2;
+                    $pt[5] += $outTL[1] - $border['t']['width'];
                     if ($inTL) $pt[9] += $inTL[1];
-                    unset($pt[6]);unset($pt[7]);
+                    unset($pt[6]); unset($pt[7]);
                 }
 
                 $pt = array_values($pt);
@@ -1763,25 +1763,25 @@ 
             // draw the top border
             if ($testBt) {
                 $pt = array();
-                $pt[] = $x;                          $pt[] = $y;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$border['t']['width'];
+                $pt[] = $x; $pt[] = $y;
+                $pt[] = $x + $border['l']['width']; $pt[] = $y;
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y;
+                $pt[] = $x + $w; $pt[] = $y;
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y + $border['t']['width'];
+                $pt[] = $x + $border['l']['width']; $pt[] = $y + $border['t']['width'];
 
                 $bord = 3;
                 if (is_array($outTL)) {
-                    $bord-=1;
+                    $bord -= 1;
                     $pt[2] += $outTL[0] - $border['l']['width'];
-                    if ($inTL) $pt[10]+= $inTL[0];
-                    unset($pt[0]);unset($pt[1]);
+                    if ($inTL) $pt[10] += $inTL[0];
+                    unset($pt[0]); unset($pt[1]);
                 }
                 if (is_array($outTR)) {
-                    $bord-=2;
+                    $bord -= 2;
                     $pt[4] -= $outTR[0] - $border['r']['width'];
                     if ($inTR) $pt[8] -= $inTR[0];
-                    unset($pt[6]);unset($pt[7]);
+                    unset($pt[6]); unset($pt[7]);
                 }
 
                 $pt = array_values($pt);
@@ -1791,25 +1791,25 @@ 
             // draw the right border
             if ($testBr) {
                 $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
+                $pt[] = $x + $w; $pt[] = $y;
+                $pt[] = $x + $w; $pt[] = $y + $border['t']['width'];
+                $pt[] = $x + $w; $pt[] = $y + $h - $border['b']['width'];
+                $pt[] = $x + $w; $pt[] = $y + $h;
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y + $h - $border['b']['width'];
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y + $border['t']['width'];
 
                 $bord = 3;
                 if (is_array($outTR)) {
-                    $bord-=1;
+                    $bord -= 1;
                     $pt[3] += $outTR[1] - $border['t']['width'];
-                    if ($inTR) $pt[11]+= $inTR[1];
-                    unset($pt[0]);unset($pt[1]);
+                    if ($inTR) $pt[11] += $inTR[1];
+                    unset($pt[0]); unset($pt[1]);
                 }
                 if (is_array($outBR)) {
-                    $bord-=2;
+                    $bord -= 2;
                     $pt[5] -= $outBR[1] - $border['b']['width'];
                     if ($inBR) $pt[9] -= $inBR[1];
-                    unset($pt[6]);unset($pt[7]);
+                    unset($pt[6]); unset($pt[7]);
                 }
 
                 $pt = array_values($pt);
@@ -1819,25 +1819,25 @@ 
             // draw the bottom border
             if ($testBb) {
                 $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h;
-                $pt[] = $x;                          $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
+                $pt[] = $x + $w; $pt[] = $y + $h;
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y + $h;
+                $pt[] = $x + $border['l']['width']; $pt[] = $y + $h;
+                $pt[] = $x; $pt[] = $y + $h;
+                $pt[] = $x + $border['l']['width']; $pt[] = $y + $h - $border['b']['width'];
+                $pt[] = $x + $w - $border['r']['width']; $pt[] = $y + $h - $border['b']['width'];
 
                 $bord = 3;
                 if (is_array($outBL)) {
-                    $bord-=2;
+                    $bord -= 2;
                     $pt[4] += $outBL[0] - $border['l']['width'];
                     if ($inBL) $pt[8] += $inBL[0];
-                    unset($pt[6]);unset($pt[7]);
+                    unset($pt[6]); unset($pt[7]);
                 }
                 if (is_array($outBR)) {
-                    $bord-=1;
+                    $bord -= 1;
                     $pt[2] -= $outBR[0] - $border['r']['width'];
-                    if ($inBR) $pt[10]-= $inBR[0];
-                    unset($pt[0]);unset($pt[1]);
+                    if ($inBR) $pt[10] -= $inBR[0];
+                    unset($pt[0]); unset($pt[1]);
 
                 }
 
@@ -1863,7 +1863,7 @@ 
         {
             $this->pdf->setFillColorArray($color);
 
-            if (count($pt)==10)
+            if (count($pt) == 10)
                 $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
             else
                 $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
@@ -1879,128 +1879,128 @@ 
          * @param  float   $width
          * @param  integer $radius (binary from 0 to 3 with 1=>start with a radius, 2=>end with a radius)
          */
-        protected function _drawLine($pt, $color, $type, $width, $radius=3)
+        protected function _drawLine($pt, $color, $type, $width, $radius = 3)
         {
             // set the fill color
             $this->pdf->setFillColorArray($color);
 
             // if dashed or dotted
-            if ($type=='dashed' || $type=='dotted') {
+            if ($type == 'dashed' || $type == 'dotted') {
 
                 // clean the end of the line, if radius
-                if ($radius==1) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+                if ($radius == 1) {
+                    $tmp = array(); $tmp[] = $pt[0]; $tmp[] = $pt[1]; $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[8]; $tmp[] = $pt[9];
                     $this->pdf->Polygon($tmp, 'F');
 
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+                    $tmp = array(); $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[4]; $tmp[] = $pt[5]; $tmp[] = $pt[6]; $tmp[] = $pt[7]; $tmp[] = $pt[8]; $tmp[] = $pt[9];
                     $pt = $tmp;
-                } else if ($radius==2) {
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
+                } else if ($radius == 2) {
+                    $tmp = array(); $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[4]; $tmp[] = $pt[5]; $tmp[] = $pt[6]; $tmp[] = $pt[7];
                     $this->pdf->Polygon($tmp, 'F');
 
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+                    $tmp = array(); $tmp[] = $pt[0]; $tmp[] = $pt[1]; $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[6]; $tmp[] = $pt[7]; $tmp[] = $pt[8]; $tmp[] = $pt[9];
                     $pt = $tmp;
-                } else if ($radius==3) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+                } else if ($radius == 3) {
+                    $tmp = array(); $tmp[] = $pt[0]; $tmp[] = $pt[1]; $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[10]; $tmp[] = $pt[11];
                     $this->pdf->Polygon($tmp, 'F');
 
-                    $tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+                    $tmp = array(); $tmp[] = $pt[4]; $tmp[] = $pt[5]; $tmp[] = $pt[6]; $tmp[] = $pt[7]; $tmp[] = $pt[8]; $tmp[] = $pt[9];
                     $this->pdf->Polygon($tmp, 'F');
 
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+                    $tmp = array(); $tmp[] = $pt[2]; $tmp[] = $pt[3]; $tmp[] = $pt[4]; $tmp[] = $pt[5]; $tmp[] = $pt[8]; $tmp[] = $pt[9]; $tmp[] = $pt[10]; $tmp[] = $pt[11];
                     $pt = $tmp;
                 }
 
                 // horisontal or vertical line
-                if ($pt[2]==$pt[0]) {
-                    $l = abs(($pt[3]-$pt[1])*0.5);
+                if ($pt[2] == $pt[0]) {
+                    $l = abs(($pt[3] - $pt[1]) * 0.5);
                     $px = 0;
                     $py = $width;
-                    $x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
-                    $x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
+                    $x1 = $pt[0]; $y1 = ($pt[3] + $pt[1]) * 0.5;
+                    $x2 = $pt[6]; $y2 = ($pt[7] + $pt[5]) * 0.5;
                 } else {
-                    $l = abs(($pt[2]-$pt[0])*0.5);
+                    $l = abs(($pt[2] - $pt[0]) * 0.5);
                     $px = $width;
                     $py = 0;
-                    $x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
-                    $x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
+                    $x1 = ($pt[2] + $pt[0]) * 0.5; $y1 = $pt[1];
+                    $x2 = ($pt[6] + $pt[4]) * 0.5; $y2 = $pt[7];
                 }
 
                 // if dashed : 3x bigger than dotted
-                if ($type=='dashed') {
-                    $px = $px*3.;
-                    $py = $py*3.;
+                if ($type == 'dashed') {
+                    $px = $px * 3.;
+                    $py = $py * 3.;
                 }
-                $mode = ($l/($px+$py)<.5);
+                $mode = ($l / ($px + $py) < .5);
 
                 // display the dotted/dashed line
-                for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
-                    if (($i%2)==$mode) {
-                        $j = $i-0.5;
-                        $lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
-                        $ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
-                        $lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
-                        $ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
+                for ($i = 0; $l - ($px + $py) * ($i - 0.5) > 0; $i++) {
+                    if (($i % 2) == $mode) {
+                        $j = $i - 0.5;
+                        $lx1 = $px * ($j); if ($lx1 < -$l) $lx1 = -$l;
+                        $ly1 = $py * ($j); if ($ly1 < -$l) $ly1 = -$l;
+                        $lx2 = $px * ($j + 1); if ($lx2 > $l)  $lx2 = $l;
+                        $ly2 = $py * ($j + 1); if ($ly2 > $l)  $ly2 = $l;
 
                         $tmp = array();
-                        $tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
-                        $tmp[] = $x1+$lx2; $tmp[] = $y1+$ly2;
-                        $tmp[] = $x2+$lx2; $tmp[] = $y2+$ly2;
-                        $tmp[] = $x2+$lx1; $tmp[] = $y2+$ly1;
+                        $tmp[] = $x1 + $lx1; $tmp[] = $y1 + $ly1;
+                        $tmp[] = $x1 + $lx2; $tmp[] = $y1 + $ly2;
+                        $tmp[] = $x2 + $lx2; $tmp[] = $y2 + $ly2;
+                        $tmp[] = $x2 + $lx1; $tmp[] = $y2 + $ly1;
                         $this->pdf->Polygon($tmp, 'F');
 
-                        if ($j>0) {
+                        if ($j > 0) {
                             $tmp = array();
-                            $tmp[] = $x1-$lx1; $tmp[] = $y1-$ly1;
-                            $tmp[] = $x1-$lx2; $tmp[] = $y1-$ly2;
-                            $tmp[] = $x2-$lx2; $tmp[] = $y2-$ly2;
-                            $tmp[] = $x2-$lx1; $tmp[] = $y2-$ly1;
+                            $tmp[] = $x1 - $lx1; $tmp[] = $y1 - $ly1;
+                            $tmp[] = $x1 - $lx2; $tmp[] = $y1 - $ly2;
+                            $tmp[] = $x2 - $lx2; $tmp[] = $y2 - $ly2;
+                            $tmp[] = $x2 - $lx1; $tmp[] = $y2 - $ly1;
                             $this->pdf->Polygon($tmp, 'F');
                         }
                     }
                 }
-            } else if ($type=='double') {
+            } else if ($type == 'double') {
 
                 // if double, 2 lines : 0=>1/3 and 2/3=>1
                 $pt1 = $pt;
                 $pt2 = $pt;
 
-                if (count($pt)==12) {
+                if (count($pt) == 12) {
                     // line 1
-                    $pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
-                    $pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
-                    $pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
-                    $pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
-                    $pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
-                    $pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
-                    $pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
-                    $pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
-                    $pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
-                    $pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
+                    $pt1[0] = ($pt[0] - $pt[10]) * 0.33 + $pt[10];
+                    $pt1[1] = ($pt[1] - $pt[11]) * 0.33 + $pt[11];
+                    $pt1[2] = ($pt[2] - $pt[10]) * 0.33 + $pt[10];
+                    $pt1[3] = ($pt[3] - $pt[11]) * 0.33 + $pt[11];
+                    $pt1[4] = ($pt[4] - $pt[8]) * 0.33 + $pt[8];
+                    $pt1[5] = ($pt[5] - $pt[9]) * 0.33 + $pt[9];
+                    $pt1[6] = ($pt[6] - $pt[8]) * 0.33 + $pt[8];
+                    $pt1[7] = ($pt[7] - $pt[9]) * 0.33 + $pt[9];
+                    $pt2[10] = ($pt[10] - $pt[0]) * 0.33 + $pt[0];
+                    $pt2[11] = ($pt[11] - $pt[1]) * 0.33 + $pt[1];
 
                     // line 2
-                    $pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
-                    $pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
-                    $pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
-                    $pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
-                    $pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
+                    $pt2[2] = ($pt[2] - $pt[0]) * 0.33 + $pt[0];
+                    $pt2[3] = ($pt[3] - $pt[1]) * 0.33 + $pt[1];
+                    $pt2[4] = ($pt[4] - $pt[6]) * 0.33 + $pt[6];
+                    $pt2[5] = ($pt[5] - $pt[7]) * 0.33 + $pt[7];
+                    $pt2[8] = ($pt[8] - $pt[6]) * 0.33 + $pt[6];
+                    $pt2[9] = ($pt[9] - $pt[7]) * 0.33 + $pt[7];
                 } else {
                     // line 1
-                    $pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
-                    $pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
-                    $pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
-                    $pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
+                    $pt1[0] = ($pt[0] - $pt[6]) * 0.33 + $pt[6];
+                    $pt1[1] = ($pt[1] - $pt[7]) * 0.33 + $pt[7];
+                    $pt1[2] = ($pt[2] - $pt[4]) * 0.33 + $pt[4];
+                    $pt1[3] = ($pt[3] - $pt[5]) * 0.33 + $pt[5];
 
                     // line 2
-                    $pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
-                    $pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
-                    $pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
+                    $pt2[6] = ($pt[6] - $pt[0]) * 0.33 + $pt[0];
+                    $pt2[7] = ($pt[7] - $pt[1]) * 0.33 + $pt[1];
+                    $pt2[4] = ($pt[4] - $pt[2]) * 0.33 + $pt[2];
+                    $pt2[5] = ($pt[5] - $pt[3]) * 0.33 + $pt[3];
                 }
                 $this->pdf->Polygon($pt1, 'F');
                 $this->pdf->Polygon($pt2, 'F');
-            } else if ($type=='solid') {
+            } else if ($type == 'solid') {
                 // solid line : draw directly the polygon
                 $this->pdf->Polygon($pt, 'F');
             }
@@ -2025,7 +2025,7 @@ 
             $actions = array();
 
             // for actions
-            for ($k=0; $k<count($match[0]); $k++) {
+            for ($k = 0; $k < count($match[0]); $k++) {
 
                 // get the name of the action
                 $name = strtolower($match[1][$k]);
@@ -2037,46 +2037,46 @@ 
                 }
 
                 // prepare the matrix, depending on the action
-                switch($name)
+                switch ($name)
                 {
                     case 'scale':
-                        if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
-                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
-                        $actions[] = array($val[0],0,0,$val[1],0,0);
+                        if (!isset($val[0])) $val[0] = 1.; else $val[0] = 1. * $val[0];
+                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1. * $val[1];
+                        $actions[] = array($val[0], 0, 0, $val[1], 0, 0);
                         break;
 
                     case 'translate':
                         if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
                         if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
-                        $actions[] = array(1,0,0,1,$val[0],$val[1]);
+                        $actions[] = array(1, 0, 0, 1, $val[0], $val[1]);
                         break;
 
                     case 'rotate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0] * M_PI / 180.;
                         if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
                         if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
-                        $actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
+                        if ($val[1] || $val[2]) $actions[] = array(1, 0, 0, 1, -$val[1], -$val[2]);
+                        $actions[] = array(cos($val[0]), sin($val[0]), -sin($val[0]), cos($val[0]), 0, 0);
+                        if ($val[1] || $val[2]) $actions[] = array(1, 0, 0, 1, $val[1], $val[2]);
                         break;
 
                     case 'skewx':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,0,tan($val[0]),1,0,0);
+                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0] * M_PI / 180.;
+                        $actions[] = array(1, 0, tan($val[0]), 1, 0, 0);
                         break;
 
                     case 'skewy':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,tan($val[0]),0,1,0,0);
+                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0] * M_PI / 180.;
+                        $actions[] = array(1, tan($val[0]), 0, 1, 0, 0);
                         break;
                     case 'matrix':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
+                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0] * 1.;
+                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1] * 1.;
+                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2] * 1.;
+                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3] * 1.;
                         if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
                         if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
-                        $actions[] =$val;
+                        $actions[] = $val;
                         break;
                 }
             }
@@ -2090,12 +2090,12 @@ 
             // foreach matrix => multiply to the last matrix
             foreach ($actions as $n) {
                 $m = array(
-                    $m[0]*$n[0]+$m[2]*$n[1],
-                    $m[1]*$n[0]+$m[3]*$n[1],
-                    $m[0]*$n[2]+$m[2]*$n[3],
-                    $m[1]*$n[2]+$m[3]*$n[3],
-                    $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-                    $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
+                    $m[0] * $n[0] + $m[2] * $n[1],
+                    $m[1] * $n[0] + $m[3] * $n[1],
+                    $m[0] * $n[2] + $m[2] * $n[3],
+                    $m[1] * $n[2] + $m[3] * $n[3],
+                    $m[0] * $n[4] + $m[2] * $n[5] + $m[4],
+                    $m[1] * $n[4] + $m[3] * $n[5] + $m[5]
                 );
             }
 
@@ -2114,10 +2114,10 @@ 
 
             // for each cell without colspan, we get the max width for each column
             $sw = array();
-            for ($x=0; $x<count($corr[0]); $x++) {
-                $m=0;
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1) {
+            for ($x = 0; $x < count($corr[0]); $x++) {
+                $m = 0;
+                for ($y = 0; $y < count($corr); $y++) {
+                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2] == 1) {
                         $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);
                     }
                 }
@@ -2125,17 +2125,17 @@ 
             }
 
             // for each cell with colspan, we adapt the width of each column
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
+            for ($x = 0; $x < count($corr[0]); $x++) {
+                for ($y = 0; $y < count($corr); $y++) {
+                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2] > 1) {
 
                         // sum the max width of each column in colspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+                        $s = 0; for ($i = 0; $i < $corr[$y][$x][2]; $i++) $s += $sw[$x + $i];
 
                         // if the max width is < the width of the cell with colspan => we adapt the width of each max width
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+                        if ($s > 0 && $s < $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
+                            for ($i = 0; $i < $corr[$y][$x][2]; $i++) {
+                                $sw[$x + $i] = $sw[$x + $i] / $s * $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
                             }
                         }
                     }
@@ -2143,17 +2143,17 @@ 
             }
 
             // set the new width, for each cell
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
+            for ($x = 0; $x < count($corr[0]); $x++) {
+                for ($y = 0; $y < count($corr); $y++) {
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
                         // without colspan
-                        if ($corr[$y][$x][2]==1) {
+                        if ($corr[$y][$x][2] == 1) {
                             $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
                         // with colspan
                         } else {
                             $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $s+= $sw[$x+$i];
+                            for ($i = 0; $i < $corr[$y][$x][2]; $i++) {
+                                $s += $sw[$x + $i];
                             }
                             $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
                         }
@@ -2163,10 +2163,10 @@ 
 
             // for each cell without rowspan, we get the max height for each line
             $sh = array();
-            for ($y=0; $y<count($corr); $y++) {
-                $m=0;
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1) {
+            for ($y = 0; $y < count($corr); $y++) {
+                $m = 0;
+                for ($x = 0; $x < count($corr[0]); $x++) {
+                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3] == 1) {
                         $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
                     }
                 }
@@ -2174,17 +2174,17 @@ 
             }
 
             // for each cell with rowspan, we adapt the height of each line
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
+            for ($y = 0; $y < count($corr); $y++) {
+                for ($x = 0; $x < count($corr[0]); $x++) {
+                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3] > 1) {
 
                         // sum the max height of each line in rowspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+                        $s = 0; for ($i = 0; $i < $corr[$y][$x][3]; $i++) $s += $sh[$y + $i];
 
                         // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
+                        if ($s > 0 && $s < $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
+                            for ($i = 0; $i < $corr[$y][$x][3]; $i++) {
+                                $sh[$y + $i] = $sh[$y + $i] / $s * $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
                             }
                         }
                     }
@@ -2192,26 +2192,26 @@ 
             }
 
             // set the new height, for each cell
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
+            for ($y = 0; $y < count($corr); $y++) {
+                for ($x = 0; $x < count($corr[0]); $x++) {
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
                         // without rowspan
-                        if ($corr[$y][$x][3]==1) {
+                        if ($corr[$y][$x][3] == 1) {
                             $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
                         // with rowspan
                         } else {
                             $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $s+= $sh[$y+$i];
+                            for ($i = 0; $i < $corr[$y][$x][3]; $i++) {
+                                $s += $sh[$y + $i];
                             }
                             $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
 
-                            for ($j=1; $j<$corr[$y][$x][3]; $j++) {
-                                $tx = $x+1;
-                                $ty = $y+$j;
+                            for ($j = 1; $j < $corr[$y][$x][3]; $j++) {
+                                $tx = $x + 1;
+                                $ty = $y + $j;
                                 for (true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
                                 if (isset($corr[$ty][$tx])) {
-                                    $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+                                    $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw'] += $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
                                 }
                             }
                         }
@@ -2230,11 +2230,11 @@ 
         protected function _tag_open_PAGE($param)
         {
             if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
+            if ($this->_debugActif) $this->_DEBUG_add('PAGE ' . ($this->_page + 1), true);
 
-            $newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
+            $newPageSet = (!isset($param['pageset']) || $param['pageset'] != 'old');
 
-            $resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup']=='new');
+            $resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup'] == 'new');
 
             $this->_maxH = 0;
 
@@ -2247,12 +2247,12 @@ 
                 $orientation = '';
                 if (isset($param['orientation'])) {
                     $param['orientation'] = strtolower($param['orientation']);
-                    if ($param['orientation']=='p')         $orientation = 'P';
-                    if ($param['orientation']=='portrait')  $orientation = 'P';
+                    if ($param['orientation'] == 'p')         $orientation = 'P';
+                    if ($param['orientation'] == 'portrait')  $orientation = 'P';
 
-                    if ($param['orientation']=='l')         $orientation = 'L';
-                    if ($param['orientation']=='paysage')   $orientation = 'L';
-                    if ($param['orientation']=='landscape') $orientation = 'L';
+                    if ($param['orientation'] == 'l')         $orientation = 'L';
+                    if ($param['orientation'] == 'paysage')   $orientation = 'L';
+                    if ($param['orientation'] == 'landscape') $orientation = 'L';
                 }
 
                 // format
@@ -2267,29 +2267,29 @@ 
                 // background
                 $background = array();
                 if (isset($param['backimg'])) {
-                    $background['img']    = isset($param['backimg'])  ? $param['backimg']  : '';       // src of the image
+                    $background['img']    = isset($param['backimg']) ? $param['backimg'] : ''; // src of the image
                     $background['posX']   = isset($param['backimgx']) ? $param['backimgx'] : 'center'; // horizontale position of the image
                     $background['posY']   = isset($param['backimgy']) ? $param['backimgy'] : 'middle'; // vertical position of the image
-                    $background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%';   // width of the image (100% = page width)
+                    $background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%'; // width of the image (100% = page width)
 
                     // convert the src of the image, if parameters
                     $background['img'] = str_replace('&amp;', '&', $background['img']);
 
                     // convert the positions
-                    if ($background['posX']=='left')    $background['posX'] = '0%';
-                    if ($background['posX']=='center')  $background['posX'] = '50%';
-                    if ($background['posX']=='right')   $background['posX'] = '100%';
-                    if ($background['posY']=='top')     $background['posY'] = '0%';
-                    if ($background['posY']=='middle')  $background['posY'] = '50%';
-                    if ($background['posY']=='bottom')  $background['posY'] = '100%';
+                    if ($background['posX'] == 'left')    $background['posX'] = '0%';
+                    if ($background['posX'] == 'center')  $background['posX'] = '50%';
+                    if ($background['posX'] == 'right')   $background['posX'] = '100%';
+                    if ($background['posY'] == 'top')     $background['posY'] = '0%';
+                    if ($background['posY'] == 'middle')  $background['posY'] = '50%';
+                    if ($background['posY'] == 'bottom')  $background['posY'] = '100%';
 
                     if ($background['img']) {
                         // get the size of the image
                         // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                        $infos=@getimagesize($background['img']);
-                        if (count($infos)>1) {
+                        $infos = @getimagesize($background['img']);
+                        if (count($infos) > 1) {
                             $imageWidth = $this->parsingCss->ConvertToMM($background['width'], $this->pdf->getW());
-                            $imageHeight = $imageWidth*$infos[1]/$infos[0];
+                            $imageHeight = $imageWidth * $infos[1] / $infos[0];
 
                             $background['width'] = $imageWidth;
                             $background['posX']  = $this->parsingCss->ConvertToMM($background['posX'], $this->pdf->getW() - $imageWidth);
@@ -2303,10 +2303,10 @@ 
                 }
 
                 // margins of the page
-                $background['top']    = isset($param['backtop'])    ? $param['backtop']    : '0';
+                $background['top']    = isset($param['backtop']) ? $param['backtop'] : '0';
                 $background['bottom'] = isset($param['backbottom']) ? $param['backbottom'] : '0';
-                $background['left']   = isset($param['backleft'])   ? $param['backleft']   : '0';
-                $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
+                $background['left']   = isset($param['backleft']) ? $param['backleft'] : '0';
+                $background['right']  = isset($param['backright']) ? $param['backright'] : '0';
 
                 // if no unit => mm
                 if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
@@ -2322,7 +2322,7 @@ 
 
                 // get the background color
                 $res = false;
-                $background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
+                $background['color'] = isset($param['backcolor']) ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
                 if (!$res) $background['color'] = null;
 
                 $this->parsingCss->save();
@@ -2377,7 +2377,7 @@ 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
 
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
+            if ($this->_debugActif) $this->_DEBUG_add('PAGE ' . $this->_page, false);
 
             return true;
         }
@@ -2394,11 +2394,11 @@ 
             if ($this->_isForOneLine) return false;
 
             $this->_subHEADER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+            for ($this->_parsePos; $this->_parsePos < count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_header') $action['name']='page_header_sub';
+                if ($action['name'] == 'page_header') $action['name'] = 'page_header_sub';
                 $this->_subHEADER[] = $action;
-                if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
+                if (strtolower($action['name']) == 'page_header_sub' && $action['close']) break;
             }
 
             $this->_setPageHeader();
@@ -2418,11 +2418,11 @@ 
             if ($this->_isForOneLine) return false;
 
             $this->_subFOOTER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
+            for ($this->_parsePos; $this->_parsePos < count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_footer') $action['name']='page_footer_sub';
+                if ($action['name'] == 'page_footer') $action['name'] = 'page_footer_sub';
                 $this->_subFOOTER[] = $action;
-                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
+                if (strtolower($action['name']) == 'page_footer_sub' && $action['close']) break;
             }
 
             $this->_setPageFooter();
@@ -2540,8 +2540,8 @@ 
 
             $this->parsingCss->initStyle();
             $this->parsingCss->resetStyle();
-            $this->parsingCss->value['width']    = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-            $this->parsingCss->table                = array();
+            $this->parsingCss->value['width'] = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
+            $this->parsingCss->table = array();
 
             // we create a sub HTML2PFDF, and we execute on it the content of the footer, to get the height of it
             $sub = null;
@@ -2574,11 +2574,11 @@ 
 
             $this->parsingCss->value                = $this->_subSTATES['s'];
             $this->parsingCss->table                = $this->_subSTATES['t'];
-            $this->_pageMarges                 = $this->_subSTATES['mp'];
-            $this->_margeLeft                = $this->_subSTATES['ml'];
-            $this->_margeRight                = $this->_subSTATES['mr'];
-            $this->_margeTop                    = $this->_subSTATES['mt'];
-            $this->_margeBottom                = $this->_subSTATES['mb'];
+            $this->_pageMarges = $this->_subSTATES['mp'];
+            $this->_margeLeft = $this->_subSTATES['ml'];
+            $this->_margeRight = $this->_subSTATES['mr'];
+            $this->_margeTop = $this->_subSTATES['mt'];
+            $this->_margeBottom = $this->_subSTATES['mb'];
             $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
             $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
             $this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
@@ -2611,8 +2611,8 @@ 
 
             // if the content does not fit on the page => new page
             if (
-                $sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
-                $y + $sub->_maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
+                $sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin()) &&
+                $y + $sub->_maxY >= ($this->pdf->getH() - $this->pdf->getbMargin())
             ) {
                 $this->_setNewPage();
             }
@@ -2668,10 +2668,10 @@ 
             if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
 
             $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l'] + 0.03;
+            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r'] + 0.03;
+            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t'] + 0.03;
+            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b'] + 0.03;
 
             // extract the content of the div
             $level = $this->parsingHtml->getLevel($this->_parsePos);
@@ -2690,10 +2690,10 @@ 
             $wReel = $w;
             $hReel = $h;
 
-            $w+= $marge['l']+$marge['r']+0.001;
-            $h+= $marge['t']+$marge['b']+0.001;
+            $w += $marge['l'] + $marge['r'] + 0.001;
+            $h += $marge['t'] + $marge['b'] + 0.001;
 
-            if ($this->parsingCss->value['overflow']=='hidden') {
+            if ($this->parsingCss->value['overflow'] == 'hidden') {
                 $overW = max($w, $this->parsingCss->value['width']);
                 $overH = max($h, $this->parsingCss->value['height']);
                 $overflow = true;
@@ -2706,11 +2706,11 @@ 
                 $overW = null;
                 $overH = null;
                 $overflow = false;
-                $this->parsingCss->value['width']    = max($w, $this->parsingCss->value['width']);
-                $this->parsingCss->value['height']    = max($h, $this->parsingCss->value['height']);
+                $this->parsingCss->value['width'] = max($w, $this->parsingCss->value['width']);
+                $this->parsingCss->value['height'] = max($h, $this->parsingCss->value['height']);
             }
 
-            switch($this->parsingCss->value['rotate'])
+            switch ($this->parsingCss->value['rotate'])
             {
                 case 90:
                     $tmp = $overH; $overH = $overW; $overW = $tmp;
@@ -2718,7 +2718,7 @@ 
                     unset($tmp);
                     $w = $this->parsingCss->value['height'];
                     $h = $this->parsingCss->value['width'];
-                    $tX =-$h;
+                    $tX = -$h;
                     $tY = 0;
                     break;
 
@@ -2736,7 +2736,7 @@ 
                     $w = $this->parsingCss->value['height'];
                     $h = $this->parsingCss->value['width'];
                     $tX = 0;
-                    $tY =-$w;
+                    $tY = -$w;
                     break;
 
                 default:
@@ -2749,14 +2749,14 @@ 
 
             if (!$this->parsingCss->value['position']) {
                 if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+                    $w < ($this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin()) &&
+                    $this->pdf->getX() + $w >= ($this->pdf->getW() - $this->pdf->getrMargin())
                     )
                     $this->_tag_open_BR(array());
 
                 if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
+                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin())) &&
+                        ($this->pdf->getY() + $h >= ($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
                     )
                     $this->_setNewPage();
@@ -2764,9 +2764,9 @@ 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                if ($parentWidth > $w) {
+                    if ($alignObject == 'center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth - $w) * 0.5);
+                    else if ($alignObject == 'right')    $this->pdf->setX($this->pdf->getX() + $parentWidth - $w);
                 }
 
                 $this->parsingCss->setPosition();
@@ -2774,9 +2774,9 @@ 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                if ($parentWidth > $w) {
+                    if ($alignObject == 'center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth - $w) * 0.5);
+                    else if ($alignObject == 'right')    $this->pdf->setX($this->pdf->getX() + $parentWidth - $w);
                 }
 
                 $this->parsingCss->setPosition();
@@ -2805,61 +2805,61 @@ 
             );
 
             $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l'] + 0.03;
+            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r'] + 0.03;
+            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t'] + 0.03;
+            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b'] + 0.03;
 
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
+            $this->parsingCss->value['width'] -= $marge['l'] + $marge['r'];
+            $this->parsingCss->value['height'] -= $marge['t'] + $marge['b'];
 
             $xCorr = 0;
             $yCorr = 0;
             if (!$this->_subPart && !$this->_isSubPart) {
-                switch($this->parsingCss->value['text-align'])
+                switch ($this->parsingCss->value['text-align'])
                 {
                     case 'right':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel);
+                        $xCorr = ($this->parsingCss->value['width'] - $wReel);
                         break;
                     case 'center':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
+                        $xCorr = ($this->parsingCss->value['width'] - $wReel) * 0.5;
                         break;
                 }
-                if ($xCorr>0) $xCorr=0;
-                switch($this->parsingCss->value['vertical-align'])
+                if ($xCorr > 0) $xCorr = 0;
+                switch ($this->parsingCss->value['vertical-align'])
                 {
                     case 'bottom':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel);
+                        $yCorr = ($this->parsingCss->value['height'] - $hReel);
                         break;
                     case 'middle':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel)*0.5;
+                        $yCorr = ($this->parsingCss->value['height'] - $hReel) * 0.5;
                         break;
                 }
             }
 
             if ($overflow) {
-                $overW-= $marge['l']+$marge['r'];
-                $overH-= $marge['t']+$marge['b'];
+                $overW -= $marge['l'] + $marge['r'];
+                $overH -= $marge['t'] + $marge['b'];
                 $this->pdf->clippingPathStart(
-                    $this->parsingCss->value['x']+$marge['l'],
-                    $this->parsingCss->value['y']+$marge['t'],
+                    $this->parsingCss->value['x'] + $marge['l'],
+                    $this->parsingCss->value['y'] + $marge['t'],
                     $this->parsingCss->value['width'],
                     $this->parsingCss->value['height']
                 );
 
-                $this->parsingCss->value['x']+= $xCorr;
+                $this->parsingCss->value['x'] += $xCorr;
 
                 // marges from the dimension of the content
-                $mL = $this->parsingCss->value['x']+$marge['l'];
+                $mL = $this->parsingCss->value['x'] + $marge['l'];
                 $mR = $this->pdf->getW() - $mL - $overW;
             } else {
                 // marges from the dimension of the div
-                $mL = $this->parsingCss->value['x']+$marge['l'];
+                $mL = $this->parsingCss->value['x'] + $marge['l'];
                 $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
             }
 
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t']+$yCorr;
+            $x = $this->parsingCss->value['x'] + $marge['l'];
+            $y = $this->parsingCss->value['y'] + $marge['t'] + $yCorr;
             $this->_saveMargin($mL, 0, $mR);
             $this->pdf->setXY($x, $y);
 
@@ -2907,7 +2907,7 @@ 
             $this->parsingCss->analyse('fieldset', $param);
 
             // get height of LEGEND element and make fieldset corrections
-            for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
+            for ($tempPos = $this->_parsePos + 1; $tempPos < count($this->parsingHtml->code); $tempPos++) {
                 $action = $this->parsingHtml->code[$tempPos];
                 if ($action['name'] == 'fieldset') break;
                 if ($action['name'] == 'legend' && !$action['close']) {
@@ -2918,7 +2918,7 @@ 
                     $sub->parsingHtml->code = $this->parsingHtml->getLevel($tempPos - 1);
 
                     $res = null;
-                    for ($sub->_parsePos = 0; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
+                    for ($sub->_parsePos = 0; $sub->_parsePos < count($sub->parsingHtml->code); $sub->_parsePos++) {
                         $action = $sub->parsingHtml->code[$sub->_parsePos];
                         $sub->_executeAction($action);
 
@@ -2952,11 +2952,11 @@ 
          * @param  string $other name of tag that used the div tag
          * @return boolean
          */
-        protected function _tag_close_DIV($param, $other='div')
+        protected function _tag_close_DIV($param, $other = 'div')
         {
             if ($this->_isForOneLine) return false;
 
-            if ($this->parsingCss->value['overflow']=='hidden') {
+            if ($this->parsingCss->value['overflow'] == 'hidden') {
                 $this->_maxX = $this->parsingCss->value['old_maxX'];
                 $this->_maxY = $this->parsingCss->value['old_maxY'];
                 $this->_maxH = $this->parsingCss->value['old_maxH'];
@@ -2968,17 +2968,17 @@ 
                 $this->pdf->stopTransform();
 
             $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
+            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l'] + 0.03;
+            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r'] + 0.03;
+            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t'] + 0.03;
+            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b'] + 0.03;
 
             $x = $this->parsingCss->value['x'];
             $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r']+$this->parsingCss->value['margin']['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b']+$this->parsingCss->value['margin']['b'];
+            $w = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'] + $this->parsingCss->value['margin']['r'];
+            $h = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'] + $this->parsingCss->value['margin']['b'];
 
-            switch($this->parsingCss->value['rotate'])
+            switch ($this->parsingCss->value['rotate'])
             {
                 case 90:
                     $t = $w; $w = $h; $h = $t;
@@ -2993,11 +2993,11 @@ 
             }
 
 
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
+            if ($this->parsingCss->value['position'] != 'absolute') {
+                $this->pdf->setXY($x + $w, $y);
 
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
+                $this->_maxX = max($this->_maxX, $x + $w);
+                $this->_maxY = max($this->_maxY, $y + $h);
                 $this->_maxH = max($this->_maxH, $h);
             } else {
                 $this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
@@ -3005,7 +3005,7 @@ 
                 $this->_loadMax();
             }
 
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
+            $block = ($this->parsingCss->value['display'] != 'inline' && $this->parsingCss->value['position'] != 'absolute');
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -3064,8 +3064,8 @@ 
         {
             // for  compatibility with old versions < 3.29
             $lstBarcode = array();
-            $lstBarcode['UPC_A']  =    'UPCA';
-            $lstBarcode['CODE39'] =    'C39';
+            $lstBarcode['UPC_A']  = 'UPCA';
+            $lstBarcode['CODE39'] = 'C39';
 
             if (!isset($param['type']))     $param['type'] = 'C39';
             if (!isset($param['value']))    $param['value']    = 0;
@@ -3085,18 +3085,18 @@ 
 
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
-            $h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
-            $txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
+            $w = $this->parsingCss->value['width']; if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
+            $h = $this->parsingCss->value['height']; if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
+            $txt = ($param['label'] !== 'none' ? $this->parsingCss->value['font-size'] : false);
             $c = $this->parsingCss->value['color'];
             $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
 
-            $this->_maxX = max($this->_maxX, $x+$infos[0]);
-            $this->_maxY = max($this->_maxY, $y+$infos[1]);
+            $this->_maxX = max($this->_maxX, $x + $infos[0]);
+            $this->_maxY = max($this->_maxY, $y + $infos[1]);
             $this->_maxH = max($this->_maxH, $infos[1]);
             $this->_maxE++;
 
-            $this->pdf->setXY($x+$infos[0], $y);
+            $this->pdf->setXY($x + $infos[0], $y);
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -3137,13 +3137,13 @@ 
             if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
             if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
             if (isset($param['style']['border'])) {
-                $borders = $param['style']['border']!='none';
+                $borders = $param['style']['border'] != 'none';
                 unset($param['style']['border']);
             } else {
                 $borders = true;
             }
 
-            if ($param['value']==='') return true;
+            if ($param['value'] === '') return true;
             if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
 
             $this->parsingCss->save();
@@ -3171,15 +3171,15 @@ 
             }
 
             if (!$this->_subPart && !$this->_isSubPart) {
-                $this->pdf->write2DBarcode($param['value'], 'QRCODE,'.$param['ec'], $x, $y, $size, $size, $style);
+                $this->pdf->write2DBarcode($param['value'], 'QRCODE,' . $param['ec'], $x, $y, $size, $size, $style);
             }
 
-            $this->_maxX = max($this->_maxX, $x+$size);
-            $this->_maxY = max($this->_maxY, $y+$size);
+            $this->_maxX = max($this->_maxX, $x + $size);
+            $this->_maxY = max($this->_maxY, $y + $size);
             $this->_maxH = max($this->_maxH, $size);
             $this->_maxE++;
 
-            $this->pdf->setX($x+$size);
+            $this->pdf->setX($x + $size);
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -3213,7 +3213,7 @@ 
             $titre = isset($param['title']) ? trim($param['title']) : '';
             $level = isset($param['level']) ? floor($param['level']) : 0;
 
-            if ($level<0) $level = 0;
+            if ($level < 0) $level = 0;
             if ($titre) $this->pdf->Bookmark($titre, $level, -1);
 
             return true;
@@ -3241,7 +3241,7 @@ 
          */
         protected function _tag_open_WRITE($param)
         {
-            $fill = ($this->parsingCss->value['background']['color']!==null && $this->parsingCss->value['background']['image']===null);
+            $fill = ($this->parsingCss->value['background']['color'] !== null && $this->parsingCss->value['background']['image'] === null);
             if (in_array($this->parsingCss->value['id_tag'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th'))) {
                 $fill = false;
             }
@@ -3257,23 +3257,23 @@ 
             $txt = str_replace('[[page_nb]]', $this->pdf->getMyAliasNbPages(), $txt);
             $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
 
-            if ($this->parsingCss->value['text-transform']!='none') {
-                if ($this->parsingCss->value['text-transform']=='capitalize')
+            if ($this->parsingCss->value['text-transform'] != 'none') {
+                if ($this->parsingCss->value['text-transform'] == 'capitalize')
                     $txt = ucwords($txt);
-                else if ($this->parsingCss->value['text-transform']=='uppercase')
+                else if ($this->parsingCss->value['text-transform'] == 'uppercase')
                     $txt = strtoupper($txt);
-                else if ($this->parsingCss->value['text-transform']=='lowercase')
+                else if ($this->parsingCss->value['text-transform'] == 'lowercase')
                     $txt = strtolower($txt);
             }
 
             // size of the text
-            $h  = 1.08*$this->parsingCss->value['font-size'];
-            $dh = $h*$this->parsingCss->value['mini-decal'];
+            $h  = 1.08 * $this->parsingCss->value['font-size'];
+            $dh = $h * $this->parsingCss->value['mini-decal'];
             $lh = $this->parsingCss->getLineHeight();
 
             // identify the align
             $align = 'L';
-            if ($this->parsingCss->value['text-align']=='li_right') {
+            if ($this->parsingCss->value['text-align'] == 'li_right') {
                 $w = $this->parsingCss->value['width'];
                 $align = 'R';
             }
@@ -3283,10 +3283,10 @@ 
             $words = explode(' ', $txt);
             foreach ($words as $k => $word) {
                 $words[$k] = array($word, $this->pdf->GetStringWidth($word));
-                $w+= $words[$k][1];
+                $w += $words[$k][1];
             }
             $space = $this->pdf->GetStringWidth(' ');
-            $w+= $space*(count($words)-1);
+            $w += $space * (count($words) - 1);
 
             // position in the text
             $currPos = 0;
@@ -3306,13 +3306,13 @@ 
             $nb = 0;
 
             // while we have words, and the text does not fit on the line => we cut the sentence
-            while ($x+$w>$right && $x<$right+$space && count($words)) {
+            while ($x + $w > $right && $x < $right + $space && count($words)) {
                 // adding words 1 by 1 to fit on the line
-                $i=0;
+                $i = 0;
                 $old = array('', 0);
                 $str = $words[0];
                 $add = false;
-                while (($x+$str[1])<$right) {
+                while (($x + $str[1]) < $right) {
                     $i++;
                     $add = true;
 
@@ -3320,26 +3320,26 @@ 
                     $old = $str;
 
                     if (!count($words)) break;
-                    $str[0].= ' '.$words[0][0];
-                    $str[1]+= $space+$words[0][1];
+                    $str[0] .= ' ' . $words[0][0];
+                    $str[1] += $space + $words[0][1];
                 }
                 $str = $old;
 
                 // if  nothing fit on the line, and if the first word does not fit on the line => the word is too long, we put it
-                if ($i==0 && (($left+$words[0][1])>=$right)) {
+                if ($i == 0 && (($left + $words[0][1]) >= $right)) {
                     $str = $words[0];
                     array_shift($words);
                     $i++;
                     $add = true;
                 }
-                $currPos+= ($currPos ? 1 : 0)+strlen($str[0]);
+                $currPos += ($currPos ? 1 : 0) + strlen($str[0]);
 
                 // write the extract sentence that fit on the page
-                $wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
-                if ($right - $left<$wc) $wc = $right - $left;
+                $wc = ($align == 'L' ? $str[1] : $this->parsingCss->value['width']);
+                if ($right - $left < $wc) $wc = $right - $left;
 
                 if (strlen($str[0])) {
-                    $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
+                    $this->pdf->setXY($this->pdf->getX(), $y + $dh + $dy);
                     $this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->_isInLink);
                     $this->pdf->setXY($this->pdf->getX(), $y);
                 }
@@ -3349,7 +3349,7 @@ 
                 $maxX = max($maxX, $this->pdf->getX());
 
                 // new position and new width for the "while"
-                $w-= $str[1];
+                $w -= $str[1];
                 $y = $this->pdf->getY();
                 $x = $this->pdf->getX();
                 $dy = $this->_getElementY($lh);
@@ -3357,16 +3357,16 @@ 
                 // if we have again words to write
                 if (count($words)) {
                     // remove the space at the end
-                    if ($add) $w-= $space;
+                    if ($add) $w -= $space;
 
                     // if we don't add any word, and if the first word is empty => useless space to skip
-                    if (!$add && $words[0][0]==='') {
+                    if (!$add && $words[0][0] === '') {
                         array_shift($words);
                     }
 
                     // if it is just to calculate for one line => adding the number of words
                     if ($this->_isForOneLine) {
-                        $this->_maxE+= $i;
+                        $this->_maxE += $i;
                         $this->_maxX = max($this->_maxX, $maxX);
                         return null;
                     }
@@ -3380,7 +3380,7 @@ 
                     $dy = $this->_getElementY($lh);
 
                     // if the next line does  not fit on the page => new page
-                    if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin()) {
+                    if ($y + $h >= $this->pdf->getH() - $this->pdf->getbMargin()) {
                         if (!$this->_isInOverflow && !$this->_isInFooter) {
                             $this->_setNewPage(null, '', null, $currPos);
                             $y = $this->pdf->getY();
@@ -3391,9 +3391,9 @@ 
 
                     // if more than 10000 line => error
                     $nb++;
-                    if ($nb>10000) {
-                        $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                        throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
+                    if ($nb > 10000) {
+                        $txt = ''; foreach ($words as $k => $word) $txt .= ($k ? ' ' : '') . $word[0];
+                        throw new HTML2PDF_exception(2, array($txt, $right - $left, $w));
                     }
 
                     // new margins for the new line
@@ -3403,17 +3403,17 @@ 
 
             // if we have words after automatic cut, it is because they fit on the line => we write the text
             if (count($words)) {
-                $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                $w+= $this->pdf->getWordSpacing()*(count($words));
-                $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-                $this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
+                $txt = ''; foreach ($words as $k => $word) $txt .= ($k ? ' ' : '') . $word[0];
+                $w += $this->pdf->getWordSpacing() * (count($words));
+                $this->pdf->setXY($this->pdf->getX(), $y + $dh + $dy);
+                $this->pdf->Cell(($align == 'L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
                 $this->pdf->setXY($this->pdf->getX(), $y);
                 $this->_maxH = max($this->_maxH, $lh);
-                $this->_maxE+= count($words);
+                $this->_maxE += count($words);
             }
 
             $maxX = max($maxX, $this->pdf->getX());
-            $maxY = $this->pdf->getY()+$h;
+            $maxY = $this->pdf->getY() + $h;
 
             $this->_maxX = max($this->_maxX, $maxX);
             $this->_maxY = max($this->_maxY, $maxY);
@@ -3435,7 +3435,7 @@ 
 
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
 
-            if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+            if ($this->_maxH == 0) $this->_maxY = max($this->_maxY, $this->pdf->getY() + $h);
 
             $this->_makeBreakLine($h, $curr);
 
@@ -3461,21 +3461,21 @@ 
             if ($this->_maxH) $this->_tag_open_BR($param);
 
             $fontSize = $this->parsingCss->value['font-size'];
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=0;
+            $this->parsingCss->value['font-size'] = $fontSize * 0.5; $this->_tag_open_BR($param);
+            $this->parsingCss->value['font-size'] = 0;
 
             $param['style']['width'] = '100%';
 
             $this->parsingCss->save();
-            $this->parsingCss->value['height']=$this->parsingCss->ConvertToMM('1mm');
+            $this->parsingCss->value['height'] = $this->parsingCss->ConvertToMM('1mm');
 
             $this->parsingCss->analyse('hr', $param);
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
             $h = $this->parsingCss->value['height'];
-            if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-            if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            if ($h)    $h -= $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['border']['b']['width'];
+            if ($h <= 0) $h = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['border']['b']['width'];
 
             $this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
             $this->_maxH = $h;
@@ -3485,8 +3485,8 @@ 
 
             $this->_tag_open_BR($param);
 
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=$fontSize;
+            $this->parsingCss->value['font-size'] = $fontSize * 0.5; $this->_tag_open_BR($param);
+            $this->parsingCss->value['font-size'] = $fontSize;
 
             $this->parsingCss->value['text-align'] = $oldAlign;
             $this->_setNewPositionForNewLine();
@@ -3748,7 +3748,7 @@ 
          * @param  string $other
          * @return boolean
          */
-        protected function _tag_open_U($param, $other='u')
+        protected function _tag_open_U($param, $other = 'u')
         {
             $this->parsingCss->save();
             $this->parsingCss->value['font-underline'] = true;
@@ -3810,7 +3810,7 @@ 
             $this->_isInLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
 
             if (isset($param['name'])) {
-                $name =     $param['name'];
+                $name = $param['name'];
                 if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
 
                 if (!$this->_lstAnchor[$name][1]) {
@@ -3845,7 +3845,7 @@ 
          */
         protected function _tag_close_A($param)
         {
-            $this->_isInLink    = '';
+            $this->_isInLink = '';
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
 
@@ -3954,7 +3954,7 @@ 
         {
             if ($this->_isForOneLine) return false;
 
-            $this->_maxH+= $this->parsingCss->value['margin']['b'];
+            $this->_maxH += $this->parsingCss->value['margin']['b'];
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
 
             $this->parsingCss->load();
@@ -4131,21 +4131,21 @@ 
             $this->parsingCss->fontSet();
 
              // cancel the effects of the setPosition
-            $this->pdf->setXY($this->pdf->getX()-$this->parsingCss->value['margin']['l'], $this->pdf->getY()-$this->parsingCss->value['margin']['t']);
+            $this->pdf->setXY($this->pdf->getX() - $this->parsingCss->value['margin']['l'], $this->pdf->getY() - $this->parsingCss->value['margin']['t']);
 
             list($mL, $mR) = $this->_getMargins($this->pdf->getY());
-            $mR = $this->pdf->getW()-$mR;
-            $mL+= $this->parsingCss->value['margin']['l']+$this->parsingCss->value['padding']['l'];
-            $mR+= $this->parsingCss->value['margin']['r']+$this->parsingCss->value['padding']['r'];
+            $mR = $this->pdf->getW() - $mR;
+            $mL += $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['padding']['l'];
+            $mR += $this->parsingCss->value['margin']['r'] + $this->parsingCss->value['padding']['r'];
             $this->_saveMargin($mL, 0, $mR);
 
-            if ($this->parsingCss->value['text-indent']>0) {
-                $y = $this->pdf->getY()+$this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t'];
-                $this->_pageMarges[floor($y*100)] = array($mL+$this->parsingCss->value['text-indent'], $this->pdf->getW()-$mR);
-                $y+= $this->parsingCss->getLineHeight()*0.1;
-                $this->_pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
+            if ($this->parsingCss->value['text-indent'] > 0) {
+                $y = $this->pdf->getY() + $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['padding']['t'];
+                $this->_pageMarges[floor($y * 100)] = array($mL + $this->parsingCss->value['text-indent'], $this->pdf->getW() - $mR);
+                $y += $this->parsingCss->getLineHeight() * 0.1;
+                $this->_pageMarges[floor($y * 100)] = array($mL, $this->pdf->getW() - $mR);
             }
-            $this->_makeBreakLine($this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t']);
+            $this->_makeBreakLine($this->parsingCss->value['margin']['t'] + $this->parsingCss->value['padding']['t']);
             $this->_isInParagraph = array($mL, $mR);
             return true;
         }
@@ -4164,7 +4164,7 @@ 
             if ($this->_maxH) $this->_tag_open_BR(array());
             $this->_isInParagraph = false;
             $this->_loadMargin();
-            $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
+            $h = $this->parsingCss->value['margin']['b'] + $this->parsingCss->value['padding']['b'];
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4183,7 +4183,7 @@ 
          */
         protected function _tag_open_PRE($param, $other = 'pre')
         {
-            if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
+            if ($other == 'pre' && $this->_maxH) $this->_tag_open_BR(array());
 
             $this->parsingCss->save();
             $this->parsingCss->value['font-family'] = 'courier';
@@ -4191,7 +4191,7 @@ 
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
-            if ($other=='pre') return $this->_tag_open_DIV($param, $other);
+            if ($other == 'pre') return $this->_tag_open_DIV($param, $other);
 
             return true;
         }
@@ -4219,7 +4219,7 @@ 
          */
         protected function _tag_close_PRE($param, $other = 'pre')
         {
-            if ($other=='pre') {
+            if ($other == 'pre') {
                 if ($this->_isForOneLine) return false;
 
                 $this->_tag_close_DIV($param, $other);
@@ -4253,7 +4253,7 @@ 
         protected function _tag_open_BIG($param)
         {
             $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.12;
+            $this->parsingCss->value['mini-decal'] -= $this->parsingCss->value['mini-size'] * 0.12;
             $this->parsingCss->value['mini-size'] *= 1.2;
             $this->parsingCss->analyse('big', $param);
             $this->parsingCss->setPosition();
@@ -4286,7 +4286,7 @@ 
         protected function _tag_open_SMALL($param)
         {
             $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.05;
+            $this->parsingCss->value['mini-decal'] += $this->parsingCss->value['mini-size'] * 0.05;
             $this->parsingCss->value['mini-size'] *= 0.82;
             $this->parsingCss->analyse('small', $param);
             $this->parsingCss->setPosition();
@@ -4319,7 +4319,7 @@ 
         protected function _tag_open_SUP($param)
         {
             $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.15;
+            $this->parsingCss->value['mini-decal'] -= $this->parsingCss->value['mini-size'] * 0.15;
             $this->parsingCss->value['mini-size'] *= 0.75;
             $this->parsingCss->analyse('sup', $param);
             $this->parsingCss->setPosition();
@@ -4353,7 +4353,7 @@ 
         protected function _tag_open_SUB($param)
         {
             $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.15;
+            $this->parsingCss->value['mini-decal'] += $this->parsingCss->value['mini-size'] * 0.15;
             $this->parsingCss->value['mini-size'] *= 0.75;
             $this->parsingCss->analyse('sub', $param);
             $this->parsingCss->setPosition();
@@ -4491,7 +4491,7 @@ 
 
             // if small LI
             if ($inf[1]) {
-                $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.045;
+                $this->parsingCss->value['mini-decal'] += $this->parsingCss->value['mini-size'] * 0.045;
                 $this->parsingCss->value['mini-size'] *= 0.75;
             }
 
@@ -4499,21 +4499,21 @@ 
             if ($this->_subPart) {
                 // TD for the puce
                 $tmpPos = $this->_tempPos;
-                $tmpLst1 = $this->parsingHtml->code[$tmpPos+1];
-                $tmpLst2 = $this->parsingHtml->code[$tmpPos+2];
-                $this->parsingHtml->code[$tmpPos+1] = array();
-                $this->parsingHtml->code[$tmpPos+1]['name']    = (isset($paramPUCE['src'])) ? 'img' : 'write';
-                $this->parsingHtml->code[$tmpPos+1]['param']    = $paramPUCE; unset($this->parsingHtml->code[$tmpPos+1]['param']['style']['width']);
-                $this->parsingHtml->code[$tmpPos+1]['close']    = 0;
-                $this->parsingHtml->code[$tmpPos+2] = array();
-                $this->parsingHtml->code[$tmpPos+2]['name']    = 'li';
-                $this->parsingHtml->code[$tmpPos+2]['param']    = $paramPUCE;
-                $this->parsingHtml->code[$tmpPos+2]['close']    = 1;
+                $tmpLst1 = $this->parsingHtml->code[$tmpPos + 1];
+                $tmpLst2 = $this->parsingHtml->code[$tmpPos + 2];
+                $this->parsingHtml->code[$tmpPos + 1] = array();
+                $this->parsingHtml->code[$tmpPos + 1]['name'] = (isset($paramPUCE['src'])) ? 'img' : 'write';
+                $this->parsingHtml->code[$tmpPos + 1]['param']    = $paramPUCE; unset($this->parsingHtml->code[$tmpPos + 1]['param']['style']['width']);
+                $this->parsingHtml->code[$tmpPos + 1]['close']    = 0;
+                $this->parsingHtml->code[$tmpPos + 2] = array();
+                $this->parsingHtml->code[$tmpPos + 2]['name'] = 'li';
+                $this->parsingHtml->code[$tmpPos + 2]['param']    = $paramPUCE;
+                $this->parsingHtml->code[$tmpPos + 2]['close']    = 1;
                 $this->_tag_open_TD($paramPUCE, 'li_sub');
                 $this->_tag_close_TD($param);
                 $this->_tempPos = $tmpPos;
-                $this->parsingHtml->code[$tmpPos+1] = $tmpLst1;
-                $this->parsingHtml->code[$tmpPos+2] = $tmpLst2;
+                $this->parsingHtml->code[$tmpPos + 1] = $tmpLst1;
+                $this->parsingHtml->code[$tmpPos + 2] = $tmpLst2;
             } else {
                 // TD for the puce
                 $this->_tag_open_TD($paramPUCE, 'li_sub');
@@ -4605,16 +4605,16 @@ 
             if ($this->_subPart) {
                 HTML2PDF::$_tables[$param['num']]['thead']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
                 HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
+                for ($pos = $this->_tempPos; $pos < count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
+                    if (strtolower($action['name']) == 'thead') $action['name'] = 'thead_sub';
                     HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
-                    if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
+                    if (strtolower($action['name']) == 'thead_sub' && $action['close']) break;
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['thead']['tr']);
+                $this->_parsePos += count($level);
+                HTML2PDF::$_tables[$param['num']]['tr_curr'] += count(HTML2PDF::$_tables[$param['num']]['thead']['tr']);
             }
 
             return true;
@@ -4637,7 +4637,7 @@ 
             // if we are in a sub HTM, construct the list of the TR in the thead
             if ($this->_subPart) {
                 $min = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+                $max = HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1;
                 HTML2PDF::$_tables[$param['num']]['thead']['tr'] = range($min, $max);
             }
 
@@ -4664,16 +4664,16 @@ 
             if ($this->_subPart) {
                 HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
                 HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
+                for ($pos = $this->_tempPos; $pos < count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
+                    if (strtolower($action['name']) == 'tfoot') $action['name'] = 'tfoot_sub';
                     HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
+                    if (strtolower($action['name']) == 'tfoot_sub' && $action['close']) break;
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['tfoot']['tr']);
+                $this->_parsePos += count($level);
+                HTML2PDF::$_tables[$param['num']]['tr_curr'] += count(HTML2PDF::$_tables[$param['num']]['tfoot']['tr']);
             }
 
             return true;
@@ -4696,7 +4696,7 @@ 
             // if we are in a sub HTM, construct the list of the TR in the tfoot
             if ($this->_subPart) {
                 $min = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+                $max = HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1;
                 HTML2PDF::$_tables[$param['num']]['tfoot']['tr'] = range($min, $max);
             }
 
@@ -4849,7 +4849,7 @@ 
 
             // collapse table ?
             $collapse = false;
-            if ($other=='table') {
+            if ($other == 'table') {
                 $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
             }
 
@@ -4866,50 +4866,50 @@ 
 
             // if we are in a SUB html => prepare the properties of the table
             if ($this->_subPart) {
-                if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
+                if ($this->_debugActif) $this->_DEBUG_add('Table n' . $param['num'], true);
                 HTML2PDF::$_tables[$param['num']] = array();
                 HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
                 HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
                 HTML2PDF::$_tables[$param['num']]['cellspacing']     = $this->parsingCss->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                HTML2PDF::$_tables[$param['num']]['cases']           = array();          // properties of each TR/TD
-                HTML2PDF::$_tables[$param['num']]['corr']            = array();          // link between TR/TD and colspan/rowspan
-                HTML2PDF::$_tables[$param['num']]['corr_x']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['corr_y']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['td_curr']         = 0;                // current column
-                HTML2PDF::$_tables[$param['num']]['tr_curr']         = 0;                // current row
+                HTML2PDF::$_tables[$param['num']]['cases']           = array(); // properties of each TR/TD
+                HTML2PDF::$_tables[$param['num']]['corr']            = array(); // link between TR/TD and colspan/rowspan
+                HTML2PDF::$_tables[$param['num']]['corr_x']          = 0; // position in 'cases'
+                HTML2PDF::$_tables[$param['num']]['corr_y']          = 0; // position in 'cases'
+                HTML2PDF::$_tables[$param['num']]['td_curr']         = 0; // current column
+                HTML2PDF::$_tables[$param['num']]['tr_curr']         = 0; // current row
                 HTML2PDF::$_tables[$param['num']]['curr_x']          = $this->pdf->getX();
                 HTML2PDF::$_tables[$param['num']]['curr_y']          = $this->pdf->getY();
-                HTML2PDF::$_tables[$param['num']]['width']           = 0;                // global width
-                HTML2PDF::$_tables[$param['num']]['height']          = 0;                // global height
+                HTML2PDF::$_tables[$param['num']]['width']           = 0; // global width
+                HTML2PDF::$_tables[$param['num']]['height']          = 0; // global height
                 HTML2PDF::$_tables[$param['num']]['align']           = $alignObject;
                 HTML2PDF::$_tables[$param['num']]['marge']           = array();
-                HTML2PDF::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t']+$this->parsingCss->value['border']['t']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r']+$this->parsingCss->value['border']['r']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b']+$this->parsingCss->value['border']['b']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l']+$this->parsingCss->value['border']['l']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['page']            = 0;                // number of pages
-                HTML2PDF::$_tables[$param['num']]['new_page']        = true;             // flag : new page for the current TR
-                HTML2PDF::$_tables[$param['num']]['style_value']     = null;             // CSS style of the table
-                HTML2PDF::$_tables[$param['num']]['thead']           = array();          // properties on the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']           = array();          // properties on the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['tr']     = array();          // list of the TRs in the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr']     = array();          // list of the TRs in the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['height']    = 0;             // thead height
-                HTML2PDF::$_tables[$param['num']]['tfoot']['height']    = 0;             // tfoot height
-                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();            // HTML content of the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();            // HTML content of the tfoot
-                HTML2PDF::$_tables[$param['num']]['cols']        = array();              // properties of the COLs
+                HTML2PDF::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t'] + $this->parsingCss->value['border']['t']['width'] + HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5;
+                HTML2PDF::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r'] + $this->parsingCss->value['border']['r']['width'] + HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5;
+                HTML2PDF::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b'] + $this->parsingCss->value['border']['b']['width'] + HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5;
+                HTML2PDF::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['border']['l']['width'] + HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5;
+                HTML2PDF::$_tables[$param['num']]['page']            = 0; // number of pages
+                HTML2PDF::$_tables[$param['num']]['new_page']        = true; // flag : new page for the current TR
+                HTML2PDF::$_tables[$param['num']]['style_value']     = null; // CSS style of the table
+                HTML2PDF::$_tables[$param['num']]['thead']           = array(); // properties on the thead
+                HTML2PDF::$_tables[$param['num']]['tfoot']           = array(); // properties on the tfoot
+                HTML2PDF::$_tables[$param['num']]['thead']['tr']     = array(); // list of the TRs in the thead
+                HTML2PDF::$_tables[$param['num']]['tfoot']['tr']     = array(); // list of the TRs in the tfoot
+                HTML2PDF::$_tables[$param['num']]['thead']['height']    = 0; // thead height
+                HTML2PDF::$_tables[$param['num']]['tfoot']['height']    = 0; // tfoot height
+                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array(); // HTML content of the thead
+                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array(); // HTML content of the tfoot
+                HTML2PDF::$_tables[$param['num']]['cols'] = array(); // properties of the COLs
 
                 $this->_saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
 
-                $this->parsingCss->value['width']-= HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
+                $this->parsingCss->value['width'] -= HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
             } else {
                 // we start from the first page and the first page of the table
                 HTML2PDF::$_tables[$param['num']]['page'] = 0;
                 HTML2PDF::$_tables[$param['num']]['td_curr']    = 0;
                 HTML2PDF::$_tables[$param['num']]['tr_curr']    = 0;
-                HTML2PDF::$_tables[$param['num']]['td_x']        = HTML2PDF::$_tables[$param['num']]['marge']['l']+HTML2PDF::$_tables[$param['num']]['curr_x'];
-                HTML2PDF::$_tables[$param['num']]['td_y']        = HTML2PDF::$_tables[$param['num']]['marge']['t']+HTML2PDF::$_tables[$param['num']]['curr_y'];
+                HTML2PDF::$_tables[$param['num']]['td_x']        = HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['curr_x'];
+                HTML2PDF::$_tables[$param['num']]['td_y']        = HTML2PDF::$_tables[$param['num']]['marge']['t'] + HTML2PDF::$_tables[$param['num']]['curr_y'];
 
                 // draw the borders/background of the first page/part of the table
                 $this->_drawRectangle(
@@ -4954,10 +4954,10 @@ 
                     foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
                         // hauteur de la ligne tr
                         $h = 0;
-                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
-                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
+                        for ($i = 0; $i < count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
+                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan'] == 1)
                                 $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
-                        HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
+                        HTML2PDF::$_tables[$param['num']][$mode]['height'] += $h;
                     }
                 }
 
@@ -4965,7 +4965,7 @@ 
                 HTML2PDF::$_tables[$param['num']]['width'] = HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
                 if (isset(HTML2PDF::$_tables[$param['num']]['cases'][0])) {
                     foreach (HTML2PDF::$_tables[$param['num']]['cases'][0] as $case) {
-                        HTML2PDF::$_tables[$param['num']]['width']+= $case['w'];
+                        HTML2PDF::$_tables[$param['num']]['width'] += $case['w'];
                     }
                 }
 
@@ -4974,11 +4974,11 @@ 
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'];
                 $w = HTML2PDF::$_tables[$param['num']]['width'];
-                if ($parentWidth>$w) {
-                    if (HTML2PDF::$_tables[$param['num']]['align']=='center')
-                        $x = $x + ($parentWidth-$w)*0.5;
-                    else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
-                        $x = $x + $parentWidth-$w;
+                if ($parentWidth > $w) {
+                    if (HTML2PDF::$_tables[$param['num']]['align'] == 'center')
+                        $x = $x + ($parentWidth - $w) * 0.5;
+                    else if (HTML2PDF::$_tables[$param['num']]['align'] == 'right')
+                        $x = $x + $parentWidth - $w;
 
                     HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
                 }
@@ -4988,7 +4988,7 @@ 
 
                 // minimum of the height because of margins, and of the thead and tfoot height
                 $h0 = HTML2PDF::$_tables[$param['num']]['marge']['t'] + HTML2PDF::$_tables[$param['num']]['marge']['b'];
-                $h0+= HTML2PDF::$_tables[$param['num']]['thead']['height'] + HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
+                $h0 += HTML2PDF::$_tables[$param['num']]['thead']['height'] + HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
 
                 // max height of the page
                 $max = $this->pdf->getH() - $this->pdf->getbMargin();
@@ -4998,7 +4998,7 @@ 
                 $height = $h0;
 
                 // we get the height of each line
-                for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
+                for ($k = 0; $k < count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
 
                     // if it is a TR of the thead or of the tfoot => skip
                     if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
@@ -5007,25 +5007,25 @@ 
                     // height of the line
                     $th = 0;
                     $h = 0;
-                    for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
+                    for ($i = 0; $i < count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
                         $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
 
-                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
+                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan'] == 1)
                             $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
                     }
 
                     // if the row does not fit on the page => new page
-                    if ($y+$h+$height>$max) {
-                        if ($height==$h0) $height = null;
+                    if ($y + $h + $height > $max) {
+                        if ($height == $h0) $height = null;
                         HTML2PDF::$_tables[$param['num']]['height'][] = $height;
                         $height = $h0;
                         $y = $this->_margeTop;
                     }
-                    $height+= $th;
+                    $height += $th;
                 }
 
                 // if ther is a height at the end, add it
-                if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+                if ($height != $h0 || $k == 0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
             } else {
                 // if we have tfoor, draw it
                 if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
@@ -5042,7 +5042,7 @@ 
                     $this->_makeHTMLcode();
                     $this->_isInTfoot = false;
 
-                    $this->_parsePos =     $oldParsePos;
+                    $this->_parsePos = $oldParsePos;
                     $this->parsingHtml->code = $oldParseCode;
                     HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
                     HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
@@ -5050,10 +5050,10 @@ 
 
                 // get the positions of the end of the table
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
-                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
-                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+                if (count(HTML2PDF::$_tables[$param['num']]['height']) > 1)
+                    $y = $this->_margeTop + HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height']) - 1];
+                else if (count(HTML2PDF::$_tables[$param['num']]['height']) == 1)
+                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'] + HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height']) - 1];
                 else
                     $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
 
@@ -5064,7 +5064,7 @@ 
 
                 $this->_loadMargin();
 
-                if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
+                if ($this->_debugActif) $this->_DEBUG_add('Table ' . $param['num'], false);
             }
 
             $this->parsingCss->load();
@@ -5084,7 +5084,7 @@ 
         protected function _tag_open_COL($param)
         {
             $span = isset($param['span']) ? $param['span'] : 1;
-            for ($k=0; $k<$span; $k++)
+            for ($k = 0; $k < $span; $k++)
                 HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
         }
 
@@ -5122,22 +5122,22 @@ 
 
             // position in the table
             HTML2PDF::$_tables[$param['num']]['tr_curr']++;
-            HTML2PDF::$_tables[$param['num']]['td_curr']= 0;
+            HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
 
             // if we are not in a sub html
             if (!$this->_subPart) {
 
                 // Y after the row
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    $ty = max($ty, HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h']);
+                $ty = null;
+                for ($ii = 0; $ii < count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1]); $ii++) {
+                    $ty = max($ty, HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][$ii]['h']);
                 }
 
                 // height of the tfoot
                 $hfoot = HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
 
                 // if the line does not fit on the page => new page
-                if (!$this->_isInTfoot && HTML2PDF::$_tables[$param['num']]['td_y'] + HTML2PDF::$_tables[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin()) {
+                if (!$this->_isInTfoot && HTML2PDF::$_tables[$param['num']]['td_y'] + HTML2PDF::$_tables[$param['num']]['marge']['b'] + $ty + $hfoot > $this->pdf->getH() - $this->pdf->getbMargin()) {
 
                     // fi ther is a tfoot => draw it
                     if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
@@ -5154,7 +5154,7 @@ 
                         $this->_makeHTMLcode();
                         $this->_isInTfoot = false;
 
-                        $this->_parsePos =     $oldParsePos;
+                        $this->_parsePos = $oldParsePos;
                         $this->parsingHtml->code = $oldParseCode;
                         HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
                         HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
@@ -5167,7 +5167,7 @@ 
                     // new position
                     HTML2PDF::$_tables[$param['num']]['page']++;
                     HTML2PDF::$_tables[$param['num']]['curr_y'] = $this->pdf->getY();
-                    HTML2PDF::$_tables[$param['num']]['td_y'] = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['marge']['t'];
+                    HTML2PDF::$_tables[$param['num']]['td_y'] = HTML2PDF::$_tables[$param['num']]['curr_y'] + HTML2PDF::$_tables[$param['num']]['marge']['t'];
 
                     // if we have the height of the tbale on the page => draw borders and background
                     if (isset(HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']])) {
@@ -5181,7 +5181,7 @@ 
                             HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']],
                             $this->parsingCss->value['border'],
                             $this->parsingCss->value['padding'],
-                            HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
+                            HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5,
                             $this->parsingCss->value['background']
                         );
 
@@ -5205,7 +5205,7 @@ 
                     $this->_makeHTMLcode();
                     $this->_isInThead = false;
 
-                    $this->_parsePos =     $oldParsePos;
+                    $this->_parsePos = $oldParsePos;
                     $this->parsingHtml->code = $oldParseCode;
                     HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
                     HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
@@ -5214,12 +5214,12 @@ 
             // else (in a sub HTML)
             } else {
                 // prepare it
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
+                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1] = array();
                 if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
                     HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
 
-                HTML2PDF::$_tables[$param['num']]['corr_x']=0;
-                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
+                HTML2PDF::$_tables[$param['num']]['corr_x'] = 0;
+                while (isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
                     HTML2PDF::$_tables[$param['num']]['corr_x']++;
             }
 
@@ -5246,16 +5246,16 @@ 
             if (!$this->_subPart) {
 
                 // Y of the current line
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    if (HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['rowspan']==1) {
-                        $ty = HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h'];
+                $ty = null;
+                for ($ii = 0; $ii < count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1]); $ii++) {
+                    if (HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][$ii]['rowspan'] == 1) {
+                        $ty = HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][$ii]['h'];
                     }
                 }
 
                 // new position
-                HTML2PDF::$_tables[$param['num']]['td_x'] = HTML2PDF::$_tables[$param['num']]['curr_x']+HTML2PDF::$_tables[$param['num']]['marge']['l'];
-                HTML2PDF::$_tables[$param['num']]['td_y']+= $ty;
+                HTML2PDF::$_tables[$param['num']]['td_x'] = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['marge']['l'];
+                HTML2PDF::$_tables[$param['num']]['td_y'] += $ty;
                 HTML2PDF::$_tables[$param['num']]['new_page'] = false;
             } else {
                 HTML2PDF::$_tables[$param['num']]['corr_y']++;
@@ -5277,15 +5277,15 @@ 
 
             $this->_maxH = 0;
 
-            $param['cellpadding'] = HTML2PDF::$_tables[$param['num']]['cellpadding'].'mm';
-            $param['cellspacing'] = HTML2PDF::$_tables[$param['num']]['cellspacing'].'mm';
+            $param['cellpadding'] = HTML2PDF::$_tables[$param['num']]['cellpadding'] . 'mm';
+            $param['cellspacing'] = HTML2PDF::$_tables[$param['num']]['cellspacing'] . 'mm';
 
             // specific style for LI
-            if ($other=='li') {
+            if ($other == 'li') {
                 $specialLi = true;
             } else {
                 $specialLi = false;
-                if ($other=='li_sub') {
+                if ($other == 'li_sub') {
                     $param['style']['border'] = 'none';
                     $param['style']['background-color']    = 'transparent';
                     $param['style']['background-image']    = 'none';
@@ -5297,7 +5297,7 @@ 
 
             // get the properties of the TD
             $x = HTML2PDF::$_tables[$param['num']]['td_curr'];
-            $y = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
+            $y = HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1;
             $colspan = isset($param['colspan']) ? $param['colspan'] : 1;
             $rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
 
@@ -5316,9 +5316,9 @@ 
 
                     // for colspans => we get all the neede widths
                     $colParam['style']['width'] = array();
-                    for ($k=0; $k<$colspan; $k++) {
-                        if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'])) {
-                            $colParam['style']['width'][] = HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'];
+                    for ($k = 0; $k < $colspan; $k++) {
+                        if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol + $k]['style']['width'])) {
+                            $colParam['style']['width'][] = HTML2PDF::$_tables[$param['num']]['cols'][$numCol + $k]['style']['width'];
                         }
                     }
 
@@ -5328,10 +5328,10 @@ 
                     if (count($colParam['style']['width'])) {
                         $total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
                         foreach ($colParam['style']['width'] as $width) {
-                            if (substr($total, -1)=='%' && substr($width, -1)=='%')
-                                $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
+                            if (substr($total, -1) == '%' && substr($width, -1) == '%')
+                                $total = (str_replace('%', '', $total) + str_replace('%', '', $width)) . '%';
                             else
-                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)) . 'mm';
                         }
                     }
 
@@ -5348,7 +5348,7 @@ 
 
                     // merge the class of the COL and the TD
                     if (isset($colParam['class'])) {
-                        $param['class'] = $colParam['class'].(isset($param['class']) ? ' '.$param['class'] : '');
+                        $param['class'] = $colParam['class'] . (isset($param['class']) ? ' ' . $param['class'] : '');
                     }
                 }
 
@@ -5377,8 +5377,8 @@ 
             $return = $this->parsingCss->analyse($other, $param, $legacy);
 
             if ($specialLi) {
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetWidth());
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetPadding());
+                $this->parsingCss->value['width'] -= $this->parsingCss->ConvertToMM($this->_listeGetWidth());
+                $this->parsingCss->value['width'] -= $this->parsingCss->ConvertToMM($this->_listeGetPadding());
             }
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
@@ -5387,25 +5387,25 @@ 
             if ($collapse) {
                 if (!$this->_subPart) {
                     if (
-                        (HTML2PDF::$_tables[$param['num']]['tr_curr']>1 && !HTML2PDF::$_tables[$param['num']]['new_page']) ||
+                        (HTML2PDF::$_tables[$param['num']]['tr_curr'] > 1 && !HTML2PDF::$_tables[$param['num']]['new_page']) ||
                         (!$this->_isInThead && count(HTML2PDF::$_tables[$param['num']]['thead']['code']))
                     ) {
                         $this->parsingCss->value['border']['t'] = $this->parsingCss->readBorder('none');
                     }
                 }
 
-                if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
-                    if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+                if (HTML2PDF::$_tables[$param['num']]['td_curr'] > 0) {
+                    if (!$return) $this->parsingCss->value['width'] += $this->parsingCss->value['border']['l']['width'];
                     $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
                 }
             }
 
             // margins of the table
             $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
+            $marge['t'] = $this->parsingCss->value['padding']['t'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['t']['width'];
+            $marge['r'] = $this->parsingCss->value['padding']['r'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['r']['width'];
+            $marge['b'] = $this->parsingCss->value['padding']['b'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['b']['width'];
+            $marge['l'] = $this->parsingCss->value['padding']['l'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['l']['width'];
 
             // if we are in a sub HTML
             if ($this->_subPart) {
@@ -5421,14 +5421,14 @@ 
                 HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Yr'] = HTML2PDF::$_tables[$param['num']]['corr_y'];
 
                 // prepare the mapping for rowspan and colspan
-                for ($j=0; $j<$rowspan; $j++) {
-                    for ($i=0; $i<$colspan; $i++) {
+                for ($j = 0; $j < $rowspan; $j++) {
+                    for ($i = 0; $i < $colspan; $i++) {
                         HTML2PDF::$_tables[$param['num']]['corr']
-                            [HTML2PDF::$_tables[$param['num']]['corr_y']+$j]
-                            [HTML2PDF::$_tables[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
+                            [HTML2PDF::$_tables[$param['num']]['corr_y'] + $j]
+                            [HTML2PDF::$_tables[$param['num']]['corr_x'] + $i] = ($i + $j > 0) ? '' : array($x, $y, $colspan, $rowspan);
                     }
                 }
-                HTML2PDF::$_tables[$param['num']]['corr_x']+= $colspan;
+                HTML2PDF::$_tables[$param['num']]['corr_x'] += $colspan;
                 while (isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
                     HTML2PDF::$_tables[$param['num']]['corr_x']++;
                 }
@@ -5438,11 +5438,11 @@ 
                 $this->_createSubHTML($this->_subHtml);
                 $this->_subHtml->parsingHtml->code = $level;
                 $this->_subHtml->_makeHTMLcode();
-                $this->_tempPos+= count($level);
+                $this->_tempPos += count($level);
             } else {
                 // new position in the table
                 HTML2PDF::$_tables[$param['num']]['td_curr']++;
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'];
+                HTML2PDF::$_tables[$param['num']]['td_x'] += HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'];
 
                 // borders and background of the TD
                 $this->_drawRectangle(
@@ -5452,28 +5452,28 @@ 
                     HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'],
                     $this->parsingCss->value['border'],
                     $this->parsingCss->value['padding'],
-                    HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
+                    HTML2PDF::$_tables[$param['num']]['cellspacing'] * 0.5,
                     $this->parsingCss->value['background']
                 );
 
                 $this->parsingCss->value['width'] = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
 
                 // marges = size of the TD
-                $mL = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
+                $mL = HTML2PDF::$_tables[$param['num']]['td_x'] + $marge['l'];
                 $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
                 $this->_saveMargin($mL, 0, $mR);
 
                 // position of the content, from vertical-align
                 $hCorr = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'];
                 $hReel = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['real_h'];
-                switch($this->parsingCss->value['vertical-align'])
+                switch ($this->parsingCss->value['vertical-align'])
                 {
                     case 'bottom':
-                        $yCorr = $hCorr-$hReel;
+                        $yCorr = $hCorr - $hReel;
                         break;
 
                     case 'middle':
-                        $yCorr = ($hCorr-$hReel)*0.5;
+                        $yCorr = ($hCorr - $hReel) * 0.5;
                         break;
 
                     case 'top':
@@ -5483,8 +5483,8 @@ 
                 }
 
                 //  position of the content
-                $x = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
-                $y = HTML2PDF::$_tables[$param['num']]['td_y']+$marge['t']+$yCorr;
+                $x = HTML2PDF::$_tables[$param['num']]['td_x'] + $marge['l'];
+                $y = HTML2PDF::$_tables[$param['num']]['td_y'] + $marge['t'] + $yCorr;
                 $this->pdf->setXY($x, $y);
                 $this->_setNewPositionForNewLine();
             }
@@ -5507,20 +5507,20 @@ 
 
             // get the margins
             $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-            $marge['t']+= 0.001;
-            $marge['r']+= 0.001;
-            $marge['b']+= 0.001;
-            $marge['l']+= 0.001;
+            $marge['t'] = $this->parsingCss->value['padding']['t'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['t']['width'];
+            $marge['r'] = $this->parsingCss->value['padding']['r'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['r']['width'];
+            $marge['b'] = $this->parsingCss->value['padding']['b'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['b']['width'];
+            $marge['l'] = $this->parsingCss->value['padding']['l'] + 0.5 * HTML2PDF::$_tables[$param['num']]['cellspacing'] + $this->parsingCss->value['border']['l']['width'];
+            $marge['t'] += 0.001;
+            $marge['r'] += 0.001;
+            $marge['b'] += 0.001;
+            $marge['l'] += 0.001;
 
             // if we are in a sub HTML
             if ($this->_subPart) {
 
                 // it msut take only one page
-                if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage()>1) {
+                if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage() > 1) {
                     throw new HTML2PDF_exception(7);
                 }
 
@@ -5533,19 +5533,19 @@ 
                 $h2 = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
 
                 // final size of the TD
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
+                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][HTML2PDF::$_tables[$param['num']]['td_curr'] - 1]['w'] = max(array($w0, $w2));
+                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][HTML2PDF::$_tables[$param['num']]['td_curr'] - 1]['h'] = max(array($h0, $h2));
 
                 // real position of the content
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_w'] = $w0;
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_h'] = $h0;
+                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][HTML2PDF::$_tables[$param['num']]['td_curr'] - 1]['real_w'] = $w0;
+                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][HTML2PDF::$_tables[$param['num']]['td_curr'] - 1]['real_h'] = $h0;
 
                 // destroy the sub HTML
                 $this->_destroySubHTML($this->_subHtml);
             } else {
                 $this->_loadMargin();
 
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'];
+                HTML2PDF::$_tables[$param['num']]['td_x'] += HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr'] - 1][HTML2PDF::$_tables[$param['num']]['td_curr'] - 1]['w'];
             }
 
             $this->parsingCss->load();
@@ -5601,10 +5601,10 @@ 
          */
         protected function _tag_open_IMG($param)
         {
-            $src    = str_replace('&amp;', '&', $param['src']);
+            $src = str_replace('&amp;', '&', $param['src']);
 
             $this->parsingCss->save();
-            $this->parsingCss->value['width']    = 0;
+            $this->parsingCss->value['width'] = 0;
             $this->parsingCss->value['height']    = 0;
             $this->parsingCss->value['border']    = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
             $this->parsingCss->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
@@ -5632,7 +5632,7 @@ 
         protected function _tag_open_SELECT($param)
         {
             if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
+                $param['name'] = 'champs_pdf_' . (count($this->_lstField) + 1);
             }
 
             $param['name'] = strtolower($param['name']);
@@ -5650,11 +5650,11 @@ 
 
             $this->_lstSelect = array();
             $this->_lstSelect['name']    = $param['name'];
-            $this->_lstSelect['multi']    = isset($param['multiple']) ? true : false;
+            $this->_lstSelect['multi'] = isset($param['multiple']) ? true : false;
             $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
-            $this->_lstSelect['options']    = array();
+            $this->_lstSelect['options'] = array();
 
-            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
+            if ($this->_lstSelect['multi'] && $this->_lstSelect['size'] < 3) $this->_lstSelect['size'] = 3;
 
             return true;
         }
@@ -5670,8 +5670,8 @@ 
         {
             // get the content of the option : it is the text of the option
             $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-            $value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_'.(count($this->_lstSelect)+1);
+            $this->_parsePos += count($level);
+            $value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_' . (count($this->_lstSelect) + 1);
 
             $this->_lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
 
@@ -5704,13 +5704,13 @@ 
             // position of the select
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
+            $f = 1.08 * $this->parsingCss->value['font-size'];
 
             // width
             $w = $this->parsingCss->value['width']; if (!$w) $w = 50;
 
             // height (automatic)
-            $h = ($f*1.07*$this->_lstSelect['size'] + 1);
+            $h = ($f * 1.07 * $this->_lstSelect['size'] + 1);
 
             $prop = $this->parsingCss->getFormStyle();
 
@@ -5721,17 +5721,17 @@ 
 
 
             // single or multi select
-            if ($this->_lstSelect['size']>1) {
+            if ($this->_lstSelect['size'] > 1) {
                 $this->pdf->ListBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
             } else {
                 $this->pdf->ComboBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
             }
 
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
+            $this->_maxX = max($this->_maxX, $x + $w);
+            $this->_maxY = max($this->_maxY, $y + $h);
             $this->_maxH = max($this->_maxH, $h);
             $this->_maxE++;
-            $this->pdf->setX($x+$w);
+            $this->pdf->setX($x + $w);
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -5751,7 +5751,7 @@ 
         protected function _tag_open_TEXTAREA($param)
         {
             if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
+                $param['name'] = 'champs_pdf_' . (count($this->_lstField) + 1);
             }
 
             $param['name'] = strtolower($param['name']);
@@ -5769,16 +5769,16 @@ 
 
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $fx = 0.65*$this->parsingCss->value['font-size'];
-            $fy = 1.08*$this->parsingCss->value['font-size'];
+            $fx = 0.65 * $this->parsingCss->value['font-size'];
+            $fy = 1.08 * $this->parsingCss->value['font-size'];
 
             // extract the content the textarea : value
             $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
+            $this->_parsePos += count($level);
 
             // automatic size, from cols and rows properties
-            $w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1;
-            $h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
+            $w = $fx * (isset($param['cols']) ? $param['cols'] : 22) + 1;
+            $h = $fy * 1.07 * (isset($param['rows']) ? $param['rows'] : 3) + 3;
 
             $prop = $this->parsingCss->getFormStyle();
 
@@ -5787,11 +5787,11 @@ 
 
             $this->pdf->TextField($param['name'], $w, $h, $prop, array(), $x, $y);
 
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
+            $this->_maxX = max($this->_maxX, $x + $w);
+            $this->_maxY = max($this->_maxY, $y + $h);
             $this->_maxH = max($this->_maxH, $h);
             $this->_maxE++;
-            $this->pdf->setX($x+$w);
+            $this->pdf->setX($x + $w);
 
             return true;
         }
@@ -5820,7 +5820,7 @@ 
          */
         protected function _tag_open_INPUT($param)
         {
-            if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
+            if (!isset($param['name']))  $param['name']  = 'champs_pdf_' . (count($this->_lstField) + 1);
             if (!isset($param['value'])) $param['value'] = '';
             if (!isset($param['type']))  $param['type']  = 'text';
 
@@ -5847,25 +5847,25 @@ 
 
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
+            $f = 1.08 * $this->parsingCss->value['font-size'];
 
             $prop = $this->parsingCss->getFormStyle();
 
-            switch($param['type'])
+            switch ($param['type'])
             {
                 case 'checkbox':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
+                    if ($h < $f) $y += ($f - $h) * 0.5;
+                    $checked = (isset($param['checked']) && $param['checked'] == 'checked');
                     $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
                     break;
 
                 case 'radio':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
+                    if ($h < $f) $y += ($f - $h) * 0.5;
+                    $checked = (isset($param['checked']) && $param['checked'] == 'checked');
                     $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
                     break;
 
@@ -5878,28 +5878,28 @@ 
 
                 case 'text':
                     $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
-                    $h = $f*1.3;
+                    $h = $f * 1.3;
                     $prop['value'] = $param['value'];
                     $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
                     break;
 
                 case 'submit':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+                    $h = $this->parsingCss->value['height']; if (!$h) $h = $f * 1.3;
                     $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'reset':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+                    $h = $this->parsingCss->value['height']; if (!$h) $h = $f * 1.3;
                     $action = array('S'=>'ResetForm');
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'button':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+                    $h = $this->parsingCss->value['height']; if (!$h) $h = $f * 1.3;
                     $action = isset($param['onclick']) ? $param['onclick'] : '';
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
@@ -5910,11 +5910,11 @@ 
                     break;
             }
 
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
+            $this->_maxX = max($this->_maxX, $x + $w);
+            $this->_maxY = max($this->_maxY, $y + $h);
             $this->_maxH = max($this->_maxH, $h);
             $this->_maxE++;
-            $this->pdf->setX($x+$w);
+            $this->pdf->setX($x + $w);
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -5952,14 +5952,14 @@ 
 
             if (!$this->parsingCss->value['position']) {
                 if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+                    $w < ($this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin()) &&
+                    $this->pdf->getX() + $w >= ($this->pdf->getW() - $this->pdf->getrMargin())
                     )
                     $this->_tag_open_BR(array());
 
                 if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
+                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin())) &&
+                        ($this->pdf->getY() + $h >= ($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
                     )
                     $this->_setNewPage();
@@ -5967,9 +5967,9 @@ 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                if ($parentWidth > $w) {
+                    if ($alignObject == 'center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth - $w) * 0.5);
+                    else if ($alignObject == 'right')    $this->pdf->setX($this->pdf->getX() + $parentWidth - $w);
                 }
 
                 $this->parsingCss->setPosition();
@@ -5977,9 +5977,9 @@ 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                if ($parentWidth > $w) {
+                    if ($alignObject == 'center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth - $w) * 0.5);
+                    else if ($alignObject == 'right')    $this->pdf->setX($this->pdf->getX() + $parentWidth - $w);
                 }
 
                 $this->parsingCss->setPosition();
@@ -6007,27 +6007,27 @@ 
             $marge['t'] = $this->parsingCss->value['border']['t']['width'];
             $marge['b'] = $this->parsingCss->value['border']['b']['width'];
 
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
+            $this->parsingCss->value['width'] -= $marge['l'] + $marge['r'];
+            $this->parsingCss->value['height'] -= $marge['t'] + $marge['b'];
 
-            $overW-= $marge['l']+$marge['r'];
-            $overH-= $marge['t']+$marge['b'];
+            $overW -= $marge['l'] + $marge['r'];
+            $overH -= $marge['t'] + $marge['b'];
 
             // clipping to draw only in the size opf the DRAW tag
             $this->pdf->clippingPathStart(
-                $this->parsingCss->value['x']+$marge['l'],
-                $this->parsingCss->value['y']+$marge['t'],
+                $this->parsingCss->value['x'] + $marge['l'],
+                $this->parsingCss->value['y'] + $marge['t'],
                 $this->parsingCss->value['width'],
                 $this->parsingCss->value['height']
             );
 
             // left and right of the DRAW tag
-            $mL = $this->parsingCss->value['x']+$marge['l'];
+            $mL = $this->parsingCss->value['x'] + $marge['l'];
             $mR = $this->pdf->getW() - $mL - $overW;
 
             // position of the DRAW tag
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t'];
+            $x = $this->parsingCss->value['x'] + $marge['l'];
+            $y = $this->parsingCss->value['y'] + $marge['t'];
 
             // prepare the drawing area
             $this->_saveMargin($mL, 0, $mR);
@@ -6042,7 +6042,7 @@ 
             );
 
             // init the translate matrix : (0,0) => ($x, $y)
-            $this->pdf->doTransform(array(1,0,0,1,$x,$y));
+            $this->pdf->doTransform(array(1, 0, 0, 1, $x, $y));
             $this->pdf->SetAlpha(1.);
             return true;
         }
@@ -6074,14 +6074,14 @@ 
 
             $x = $this->parsingCss->value['x'];
             $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b'];
+            $w = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'];
+            $h = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
 
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
+            if ($this->parsingCss->value['position'] != 'absolute') {
+                $this->pdf->setXY($x + $w, $y);
 
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
+                $this->_maxX = max($this->_maxX, $x + $w);
+                $this->_maxY = max($this->_maxY, $y + $h);
                 $this->_maxH = max($this->_maxH, $h);
                 $this->_maxE++;
             } else {
@@ -6091,7 +6091,7 @@ 
                 $this->_loadMax();
             }
 
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
+            $block = ($this->parsingCss->value['display'] != 'inline' && $this->parsingCss->value['position'] != 'absolute');
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -6236,16 +6236,16 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k] === '') unset($path[$k]);
                 }
                 $path = array_values($path);
 
                 $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
+                for ($k = 0; $k < count($path); $k += 2) {
                     $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
+                        ($k ? 'L' : 'M'),
+                        $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']),
+                        $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h'])
                     );
                 }
 
@@ -6282,16 +6282,16 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k] === '') unset($path[$k]);
                 }
                 $path = array_values($path);
 
                 $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
+                for ($k = 0; $k < count($path); $k += 2) {
                     $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
+                        ($k ? 'L' : 'M'),
+                        $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']),
+                        $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h'])
                     );
                 }
                 $actions[] = array('z');
@@ -6333,7 +6333,7 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k] === '') unset($path[$k]);
                 }
                 $path = array_values($path);
 
@@ -6341,7 +6341,7 @@ 
                 $actions = array();
                 $action = array();
                 $lastAction = null; // last action found
-                for ($k=0; $k<count($path);true) {
+                for ($k = 0; $k < count($path); true) {
 
                     // for this actions, we can not have multi coordonate
                     if (in_array($lastAction, array('z', 'Z'))) {
@@ -6349,7 +6349,7 @@ 
                     }
 
                     // read the new action (forcing if no action before)
-                    if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction===null) {
+                    if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction === null) {
                         $lastAction = $path[$k];
                         $k++;
                     }
@@ -6357,40 +6357,40 @@ 
                     // current action
                     $action = array();
                     $action[] = $lastAction;
-                    switch($lastAction)
+                    switch ($lastAction)
                     {
                         case 'C':
                         case 'c':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+4], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['h']);    // y
-                            $k+= 6;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']); // x1
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h']); // y1
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 2], $this->_isInDraw['w']); // x2
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 3], $this->_isInDraw['h']); // y2
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 4], $this->_isInDraw['w']); // x
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 5], $this->_isInDraw['h']); // y
+                            $k += 6;
                             break;
 
                         case 'Q':
                         case 'S':
                         case 'q':
                         case 's':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y
-                            $k+= 4;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']); // x2
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h']); // y2
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 2], $this->_isInDraw['w']); // x
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 3], $this->_isInDraw['h']); // y
+                            $k += 4;
                             break;
 
                         case 'A':
                         case 'a':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // rx
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // ry
-                            $action[] = 1.*$path[$k+2];                                                        // angle de deviation de l'axe X
-                            $action[] = ($path[$k+3]=='1') ? 1 : 0;                                            // large-arc-flag
-                            $action[] = ($path[$k+4]=='1') ? 1 : 0;                                            // sweep-flag
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+6], $this->_isInDraw['h']);    // y
-                            $k+= 7;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']); // rx
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h']); // ry
+                            $action[] = 1. * $path[$k + 2]; // angle de deviation de l'axe X
+                            $action[] = ($path[$k + 3] == '1') ? 1 : 0; // large-arc-flag
+                            $action[] = ($path[$k + 4] == '1') ? 1 : 0; // sweep-flag
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 5], $this->_isInDraw['w']); // x
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 6], $this->_isInDraw['h']); // y
+                            $k += 7;
                             break;
 
                         case 'M':
@@ -6399,21 +6399,21 @@ 
                         case 'm':
                         case 'l':
                         case 't':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y
-                            $k+= 2;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']); // x
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 1], $this->_isInDraw['h']); // y
+                            $k += 2;
                             break;
 
                         case 'H':
                         case 'h':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $k+= 1;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['w']); // x
+                            $k += 1;
                             break;
 
                         case 'V':
                         case 'v':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['h']);    // y
-                            $k+= 1;
+                            $action[] = $this->parsingCss->ConvertToMM($path[$k + 0], $this->_isInDraw['h']); // y
+                            $k += 1;
                             break;
 
                         case 'z':

Braces +865 added lines, -323 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * HTML2PDF Librairy - main class
  *
@@ -162,7 +164,9 @@ 
             $this->_subPart = false;
 
             // init the marges of the page
-            if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);
+            if (!is_array($marges)) {
+            	$marges = array($marges, $marges, $marges, $marges);
+            }
             $this->_setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
             $this->_setMargins();
             $this->_marges = array();
@@ -310,7 +314,9 @@ 
         {
             $oldPage = $this->_INDEX_NewPage($onPage);
             $this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
-            if ($oldPage) $this->pdf->setPage($oldPage);
+            if ($oldPage) {
+            	$this->pdf->setPage($oldPage);
+            }
         }
 
         /**
@@ -356,14 +362,24 @@ 
             }
 
             // complete parameters
-            if ($dest===false) $dest = 'I';
-            if ($dest===true)  $dest = 'S';
-            if ($dest==='')    $dest = 'I';
-            if ($name=='')     $name='document.pdf';
+            if ($dest===false) {
+            	$dest = 'I';
+            }
+            if ($dest===true) {
+            	$dest = 'S';
+            }
+            if ($dest==='') {
+            	$dest = 'I';
+            }
+            if ($name=='') {
+            	$name='document.pdf';
+            }
 
             // clean up the destination
             $dest = strtoupper($dest);
-            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
+            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) {
+            	$dest = 'I';
+            }
 
             // the name must be a PDF name
             if (strtolower(substr($name, -4))!='.pdf') {
@@ -385,8 +401,9 @@ 
         public function writeHTML($html, $debugVue = false)
         {
             // if it is a real html page, we have to convert it
-            if (preg_match('/<body/isU', $html))
-                $html = $this->getHtmlFromPage($html);
+            if (preg_match('/<body/isU', $html)) {
+                            $html = $this->getHtmlFromPage($html);
+            }
 
             $html = str_replace('[[date_y]]', date('Y'), $html);
             $html = str_replace('[[date_m]]', date('m'), $html);
@@ -422,20 +439,24 @@ 
 
             // extract the content
             $res = explode('<body', $html);
-            if (count($res)<2) return $html;
+            if (count($res)<2) {
+            	return $html;
+            }
             $content = '<page'.$res[1];
             $content = explode('</body', $content);
             $content = $content[0].'</page>';
 
             // extract the link tags
             preg_match_all('/<link([^>]*)>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.'</link>'.$content;
+            foreach ($match[0] as $src) {
+                            $content = $src.'</link>'.$content;
+            }
 
             // extract the css style tags
             preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.$content;
+            foreach ($match[0] as $src) {
+                            $content = $src.$content;
+            }
 
             return $content;
         }
@@ -513,8 +534,12 @@ 
          */
         protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
         {
-            if ($right===null)  $right = $left;
-            if ($bottom===null) $bottom = 8;
+            if ($right===null) {
+            	$right = $left;
+            }
+            if ($bottom===null) {
+            	$bottom = 8;
+            }
 
             $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
             $this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
@@ -565,8 +590,9 @@ 
                         $this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
                     }
 
-                    if (isset($this->_background['img']) && $this->_background['img'])
-                        $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
+                    if (isset($this->_background['img']) && $this->_background['img']) {
+                                            $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
+                    }
                 }
 
                 $this->_setPageHeader();
@@ -617,7 +643,9 @@ 
         protected function _DEBUG_add($name, $level=null)
         {
             // if true : UP
-            if ($level===true) $this->_debugLevel++;
+            if ($level===true) {
+            	$this->_debugLevel++;
+            }
 
             $name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
             $time  = microtime(true);
@@ -635,7 +663,9 @@ 
             $this->_debugLastTime = $time;
 
             // it false : DOWN
-            if ($level===false) $this->_debugLevel--;
+            if ($level===false) {
+            	$this->_debugLevel--;
+            }
 
             return $this;
         }
@@ -674,8 +704,9 @@ 
             $y = floor($y*100);
             $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
 
-            foreach ($this->_pageMarges as $mY => $mX)
-                if ($mY<=$y) $x = $mX;
+            foreach ($this->_pageMarges as $mY => $mX) {
+                            if ($mY<=$y) $x = $mX;
+            }
 
             return $x;
         }
@@ -697,18 +728,30 @@ 
             $oldBottom = $this->_getMargins($yBottom);
 
             // update the top float margin
-            if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
-            if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
+            if ($float=='left'  && $oldTop[0]<$xRight) {
+            	$oldTop[0] = $xRight;
+            }
+            if ($float=='right' && $oldTop[1]>$xLeft) {
+            	$oldTop[1] = $xLeft;
+            }
 
             $yTop = floor($yTop*100);
             $yBottom = floor($yBottom*100);
 
             // erase all the float margins that are smaller than the new one
             foreach ($this->_pageMarges as $mY => $mX) {
-                if ($mY<$yTop) continue;
-                if ($mY>$yBottom) break;
-                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
-                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
+                if ($mY<$yTop) {
+                	continue;
+                }
+                if ($mY>$yBottom) {
+                	break;
+                }
+                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight) {
+                	unset($this->_pageMarges[$mY]);
+                }
+                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) {
+                	unset($this->_pageMarges[$mY]);
+                }
             }
 
             // save the new Top and Bottom margins
@@ -806,7 +849,9 @@ 
          */
         protected function _setPageHeader()
         {
-            if (!count($this->_subHEADER)) return false;
+            if (!count($this->_subHEADER)) {
+            	return false;
+            }
 
             $oldParsePos = $this->_parsePos;
             $oldParseCode = $this->parsingHtml->code;
@@ -826,7 +871,9 @@ 
          */
         protected function _setPageFooter()
         {
-            if (!count($this->_subFOOTER)) return false;
+            if (!count($this->_subFOOTER)) {
+            	return false;
+            }
 
             $oldParsePos = $this->_parsePos;
             $oldParseCode = $this->parsingHtml->code;
@@ -887,15 +934,18 @@ 
                 $txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
                 $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
                 $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
-            } else
-                $sub->_parsePos++;
+            } else {
+                            $sub->_parsePos++;
+            }
 
             // for each element of the parsing => load the action
             $res = null;
             for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
                 $action = $sub->parsingHtml->code[$sub->_parsePos];
                 $res = $sub->_executeAction($action);
-                if (!$res) break;
+                if (!$res) {
+                	break;
+                }
             }
 
             $w = $sub->_maxX; // max width
@@ -906,12 +956,13 @@ 
             $this->_destroySubHTML($sub);
 
             // adapt the start of the line, depending on the text-align
-            if ($this->parsingCss->value['text-align']=='center')
-                $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-            else if ($this->parsingCss->value['text-align']=='right')
-                $this->pdf->setX($rx-$w-0.01);
-            else
-                $this->pdf->setX($lx);
+            if ($this->parsingCss->value['text-align']=='center') {
+                            $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
+            } else if ($this->parsingCss->value['text-align']=='right') {
+                            $this->pdf->setX($rx-$w-0.01);
+            } else {
+                            $this->pdf->setX($lx);
+            }
 
             // set the height of the line
             $this->_currentH = $h;
@@ -1024,8 +1075,12 @@ 
             $nbBaseFive    = array('V','L','D');
             $nbRoman    = '';
 
-            if ($nbArabic<1)    return $nbArabic;
-            if ($nbArabic>3999) return $nbArabic;
+            if ($nbArabic<1) {
+            	return $nbArabic;
+            }
+            if ($nbArabic>3999) {
+            	return $nbArabic;
+            }
 
             for ($i=3; $i>=0 ; $i--) {
                 $chiffre=floor($nbArabic/pow(10, $i));
@@ -1095,7 +1150,9 @@ 
             $nb = $this->_defList[count($this->_defList)-1]['nb'];
             $up = (substr($st, 0, 6)=='upper-');
 
-            if ($im) return array(false, false, $im);
+            if ($im) {
+            	return array(false, false, $im);
+            }
 
             switch($st)
             {
@@ -1156,12 +1213,19 @@ 
             }
 
             // prepare the datas
-            if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
-            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
+            if (!in_array($type, array('ul', 'ol'))) {
+            	$type = 'ul';
+            }
+            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) {
+            	$style = '';
+            }
 
             if (!$style) {
-                if ($type=='ul')    $style = 'disc';
-                else                $style = 'decimal';
+                if ($type=='ul') {
+                	$style = 'disc';
+                } else {
+                	$style = 'decimal';
+                }
             }
 
             // add the new level
@@ -1270,8 +1334,9 @@ 
          */
         protected function _getElementY($h)
         {
-            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
-                return 0;
+            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h) {
+                            return 0;
+            }
 
             return ($this->_currentH-$h)*0.8;
         }
@@ -1286,10 +1351,11 @@ 
         protected function _makeBreakLine($h, $curr = null)
         {
             if ($h) {
-                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
-                    $this->_setNewLine($h, $curr);
-                else
-                    $this->_setNewPage(null, '', null, $curr);
+                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter) {
+                                    $this->_setNewLine($h, $curr);
+                } else {
+                                    $this->_setNewPage(null, '', null, $curr);
+                }
             } else {
                 $this->_setNewPositionForNewLine($curr);
             }
@@ -1412,7 +1478,9 @@ 
 
             // calculate the position of the image, if align to the right
             if ($parentWidth>$w && $float!='left') {
-                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right') {
+                	$x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+                }
             }
 
             // display the image
@@ -1483,7 +1551,9 @@ 
         protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
         {
             // if we are in a subpart or if height is null => return false
-            if ($this->_subPart || $this->_isSubPart || $h===null) return false;
+            if ($this->_subPart || $this->_isSubPart || $h===null) {
+            	return false;
+            }
 
             // add the margin
             $x+= $margin;
@@ -1526,10 +1596,18 @@ 
                 $inBL[1]-= $border['b']['width'];
             }
 
-            if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
-            if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
-            if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
-            if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
+            if ($inTL[0]<=0 || $inTL[1]<=0) {
+            	$inTL = null;
+            }
+            if ($inTR[0]<=0 || $inTR[1]<=0) {
+            	$inTR = null;
+            }
+            if ($inBR[0]<=0 || $inBR[1]<=0) {
+            	$inBR = null;
+            }
+            if ($inBL[0]<=0 || $inBL[1]<=0) {
+            	$inBL = null;
+            }
 
             // prepare the background color
             $pdfStyle = '';
@@ -1587,13 +1665,21 @@ 
                     $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
 
                     // prepare the position of the backgroung
-                    if ($iRepeat[0]) $iPosition[0] = $bX;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                    else $iPosition[0] = $bX+$iPosition[0];
+                    if ($iRepeat[0]) {
+                    	$iPosition[0] = $bX;
+                    } else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) {
+                    	$iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
+                    } else {
+                    	$iPosition[0] = $bX+$iPosition[0];
+                    }
 
-                    if ($iRepeat[1]) $iPosition[1] = $bY;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                    else $iPosition[1] = $bY+$iPosition[1];
+                    if ($iRepeat[1]) {
+                    	$iPosition[1] = $bY;
+                    } else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) {
+                    	$iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
+                    } else {
+                    	$iPosition[1] = $bY+$iPosition[1];
+                    }
 
                     $imageXmin = $bX;
                     $imageXmax = $bX+$bW;
@@ -1645,10 +1731,18 @@ 
             $y-= $loose;
             $w+= 2.*$loose;
             $h+= 2.*$loose;
-            if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
-            if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
-            if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
-            if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
+            if ($border['l']['width']) {
+            	$border['l']['width']+= 2.*$loose;
+            }
+            if ($border['t']['width']) {
+            	$border['t']['width']+= 2.*$loose;
+            }
+            if ($border['r']['width']) {
+            	$border['r']['width']+= 2.*$loose;
+            }
+            if ($border['b']['width']) {
+            	$border['b']['width']+= 2.*$loose;
+            }
 
             // prepare the test on borders
             $testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
@@ -1746,13 +1840,17 @@ 
                 if (is_array($outBL)) {
                     $bord-=1;
                     $pt[3] -= $outBL[1] - $border['b']['width'];
-                    if ($inBL) $pt[11]-= $inBL[1];
+                    if ($inBL) {
+                    	$pt[11]-= $inBL[1];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outTL)) {
                     $bord-=2;
                     $pt[5] += $outTL[1]-$border['t']['width'];
-                    if ($inTL) $pt[9] += $inTL[1];
+                    if ($inTL) {
+                    	$pt[9] += $inTL[1];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1774,13 +1872,17 @@ 
                 if (is_array($outTL)) {
                     $bord-=1;
                     $pt[2] += $outTL[0] - $border['l']['width'];
-                    if ($inTL) $pt[10]+= $inTL[0];
+                    if ($inTL) {
+                    	$pt[10]+= $inTL[0];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outTR)) {
                     $bord-=2;
                     $pt[4] -= $outTR[0] - $border['r']['width'];
-                    if ($inTR) $pt[8] -= $inTR[0];
+                    if ($inTR) {
+                    	$pt[8] -= $inTR[0];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1802,13 +1904,17 @@ 
                 if (is_array($outTR)) {
                     $bord-=1;
                     $pt[3] += $outTR[1] - $border['t']['width'];
-                    if ($inTR) $pt[11]+= $inTR[1];
+                    if ($inTR) {
+                    	$pt[11]+= $inTR[1];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outBR)) {
                     $bord-=2;
                     $pt[5] -= $outBR[1] - $border['b']['width'];
-                    if ($inBR) $pt[9] -= $inBR[1];
+                    if ($inBR) {
+                    	$pt[9] -= $inBR[1];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1830,13 +1936,17 @@ 
                 if (is_array($outBL)) {
                     $bord-=2;
                     $pt[4] += $outBL[0] - $border['l']['width'];
-                    if ($inBL) $pt[8] += $inBL[0];
+                    if ($inBL) {
+                    	$pt[8] += $inBL[0];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
                 if (is_array($outBR)) {
                     $bord-=1;
                     $pt[2] -= $outBR[0] - $border['r']['width'];
-                    if ($inBR) $pt[10]-= $inBR[0];
+                    if ($inBR) {
+                    	$pt[10]-= $inBR[0];
+                    }
                     unset($pt[0]);unset($pt[1]);
 
                 }
@@ -1863,10 +1973,11 @@ 
         {
             $this->pdf->setFillColorArray($color);
 
-            if (count($pt)==10)
-                $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-            else
-                $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+            if (count($pt)==10) {
+                            $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
+            } else {
+                            $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+            }
         }
 
         /**
@@ -1937,10 +2048,18 @@ 
                 for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
                     if (($i%2)==$mode) {
                         $j = $i-0.5;
-                        $lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
-                        $ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
-                        $lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
-                        $ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
+                        $lx1 = $px*($j);   if ($lx1<-$l) {
+                        	$lx1 =-$l;
+                        }
+                        $ly1 = $py*($j);   if ($ly1<-$l) {
+                        	$ly1 =-$l;
+                        }
+                        $lx2 = $px*($j+1); if ($lx2>$l) {
+                        	$lx2 = $l;
+                        }
+                        $ly2 = $py*($j+1); if ($ly2>$l) {
+                        	$ly2 = $l;
+                        }
 
                         $tmp = array();
                         $tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
@@ -2016,10 +2135,14 @@ 
         protected function _prepareTransform($transform)
         {
             // it can not be  empty
-            if (!$transform) return null;
+            if (!$transform) {
+            	return null;
+            }
 
             // sctions must be like scale(...)
-            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
+            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) {
+            	return null;
+            }
 
             // prepare the list of the actions
             $actions = array();
@@ -2040,49 +2163,115 @@ 
                 switch($name)
                 {
                     case 'scale':
-                        if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
-                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
+                        if (!isset($val[0])) {
+                        	$val[0] = 1.;
+                        } else {
+                        	$val[0] = 1.*$val[0];
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = $val[0];
+                        } else {
+                        	$val[1] = 1.*$val[1];
+                        }
                         $actions[] = array($val[0],0,0,$val[1],0,0);
                         break;
 
                     case 'translate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
+                        }
                         $actions[] = array(1,0,0,1,$val[0],$val[1]);
                         break;
 
                     case 'rotate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[2])) {
+                        	$val[2] = 0.;
+                        } else {
+                        	$val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
+                        }
+                        if ($val[1] || $val[2]) {
+                        	$actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+                        }
                         $actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
+                        if ($val[1] || $val[2]) {
+                        	$actions[] = array(1,0,0,1,$val[1],$val[2]);
+                        }
                         break;
 
                     case 'skewx':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
                         $actions[] = array(1,0,tan($val[0]),1,0,0);
                         break;
 
                     case 'skewy':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
                         $actions[] = array(1,tan($val[0]),0,1,0,0);
                         break;
                     case 'matrix':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
-                        if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
-                        if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*1.;
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $val[1]*1.;
+                        }
+                        if (!isset($val[2])) {
+                        	$val[2] = 0.;
+                        } else {
+                        	$val[2] = $val[2]*1.;
+                        }
+                        if (!isset($val[3])) {
+                        	$val[3] = 0.;
+                        } else {
+                        	$val[3] = $val[3]*1.;
+                        }
+                        if (!isset($val[4])) {
+                        	$val[4] = 0.;
+                        } else {
+                        	$val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[5])) {
+                        	$val[5] = 0.;
+                        } else {
+                        	$val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
+                        }
                         $actions[] =$val;
                         break;
                 }
             }
 
             // if ther is no actions => return
-            if (!$actions) return null;
+            if (!$actions) {
+            	return null;
+            }
 
             // get the first matrix
             $m = $actions[0]; unset($actions[0]);
@@ -2110,7 +2299,9 @@ 
          */
         protected function _calculateTableCellSize(&$cases, &$corr)
         {
-            if (!isset($corr[0])) return true;
+            if (!isset($corr[0])) {
+            	return true;
+            }
 
             // for each cell without colspan, we get the max width for each column
             $sw = array();
@@ -2130,7 +2321,9 @@ 
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
 
                         // sum the max width of each column in colspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) {
+                        	$s+= $sw[$x+$i];
+                        }
 
                         // if the max width is < the width of the cell with colspan => we adapt the width of each max width
                         if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
@@ -2179,7 +2372,9 @@ 
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
 
                         // sum the max height of each line in rowspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) {
+                        	$s+= $sh[$y+$i];
+                        }
 
                         // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
                         if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
@@ -2229,8 +2424,12 @@ 
          */
         protected function _tag_open_PAGE($param)
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('PAGE '.($this->_page+1), true);
+            }
 
             $newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
 
@@ -2247,12 +2446,22 @@ 
                 $orientation = '';
                 if (isset($param['orientation'])) {
                     $param['orientation'] = strtolower($param['orientation']);
-                    if ($param['orientation']=='p')         $orientation = 'P';
-                    if ($param['orientation']=='portrait')  $orientation = 'P';
+                    if ($param['orientation']=='p') {
+                    	$orientation = 'P';
+                    }
+                    if ($param['orientation']=='portrait') {
+                    	$orientation = 'P';
+                    }
 
-                    if ($param['orientation']=='l')         $orientation = 'L';
-                    if ($param['orientation']=='paysage')   $orientation = 'L';
-                    if ($param['orientation']=='landscape') $orientation = 'L';
+                    if ($param['orientation']=='l') {
+                    	$orientation = 'L';
+                    }
+                    if ($param['orientation']=='paysage') {
+                    	$orientation = 'L';
+                    }
+                    if ($param['orientation']=='landscape') {
+                    	$orientation = 'L';
+                    }
                 }
 
                 // format
@@ -2276,12 +2485,24 @@ 
                     $background['img'] = str_replace('&amp;', '&', $background['img']);
 
                     // convert the positions
-                    if ($background['posX']=='left')    $background['posX'] = '0%';
-                    if ($background['posX']=='center')  $background['posX'] = '50%';
-                    if ($background['posX']=='right')   $background['posX'] = '100%';
-                    if ($background['posY']=='top')     $background['posY'] = '0%';
-                    if ($background['posY']=='middle')  $background['posY'] = '50%';
-                    if ($background['posY']=='bottom')  $background['posY'] = '100%';
+                    if ($background['posX']=='left') {
+                    	$background['posX'] = '0%';
+                    }
+                    if ($background['posX']=='center') {
+                    	$background['posX'] = '50%';
+                    }
+                    if ($background['posX']=='right') {
+                    	$background['posX'] = '100%';
+                    }
+                    if ($background['posY']=='top') {
+                    	$background['posY'] = '0%';
+                    }
+                    if ($background['posY']=='middle') {
+                    	$background['posY'] = '50%';
+                    }
+                    if ($background['posY']=='bottom') {
+                    	$background['posY'] = '100%';
+                    }
 
                     if ($background['img']) {
                         // get the size of the image
@@ -2309,10 +2530,18 @@ 
                 $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
 
                 // if no unit => mm
-                if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) $background['bottom'] .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['left']))   $background['left']   .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['right']))  $background['right']  .= 'mm';
+                if (preg_match('/^([0-9]*)$/isU', $background['top'])) {
+                	$background['top']    .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) {
+                	$background['bottom'] .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['left'])) {
+                	$background['left']   .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['right'])) {
+                	$background['right']  .= 'mm';
+                }
 
                 // convert to mm
                 $background['top']    = $this->parsingCss->ConvertToMM($background['top'], $this->pdf->getH());
@@ -2323,7 +2552,9 @@ 
                 // get the background color
                 $res = false;
                 $background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
-                if (!$res) $background['color'] = null;
+                if (!$res) {
+                	$background['color'] = null;
+                }
 
                 $this->parsingCss->save();
                 $this->parsingCss->analyse('PAGE', $param);
@@ -2336,7 +2567,9 @@ 
                 // automatic footer
                 if (isset($param['footer'])) {
                     $lst = explode(';', $param['footer']);
-                    foreach ($lst as $key => $val) $lst[$key] = trim(strtolower($val));
+                    foreach ($lst as $key => $val) {
+                    	$lst[$key] = trim(strtolower($val));
+                    }
                     $page    = in_array('page', $lst);
                     $date    = in_array('date', $lst);
                     $hour    = in_array('heure', $lst);
@@ -2370,14 +2603,18 @@ 
          */
         protected function _tag_close_PAGE($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
 
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('PAGE '.$this->_page, false);
+            }
 
             return true;
         }
@@ -2391,14 +2628,20 @@ 
          */
         protected function _tag_open_PAGE_HEADER($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_subHEADER = array();
             for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_header') $action['name']='page_header_sub';
+                if ($action['name']=='page_header') {
+                	$action['name']='page_header_sub';
+                }
                 $this->_subHEADER[] = $action;
-                if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
+                if (strtolower($action['name'])=='page_header_sub' && $action['close']) {
+                	break;
+                }
             }
 
             $this->_setPageHeader();
@@ -2415,14 +2658,20 @@ 
          */
         protected function _tag_open_PAGE_FOOTER($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_subFOOTER = array();
             for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_footer') $action['name']='page_footer_sub';
+                if ($action['name']=='page_footer') {
+                	$action['name']='page_footer_sub';
+                }
                 $this->_subFOOTER[] = $action;
-                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
+                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) {
+                	break;
+                }
             }
 
             $this->_setPageFooter();
@@ -2438,7 +2687,9 @@ 
          */
         protected function _tag_open_PAGE_HEADER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             // save the current stat
             $this->_subSTATES = array();
@@ -2483,7 +2734,9 @@ 
          */
         protected function _tag_close_PAGE_HEADER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
 
@@ -2514,7 +2767,9 @@ 
          */
         protected function _tag_open_PAGE_FOOTER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             // save the current stat
             $this->_subSTATES = array();
@@ -2568,7 +2823,9 @@ 
          */
         protected function _tag_close_PAGE_FOOTER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
 
@@ -2598,7 +2855,9 @@ 
          */
         protected function _tag_open_NOBREAK($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -2633,7 +2892,9 @@ 
          */
         protected function _tag_close_NOBREAK($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -2650,8 +2911,12 @@ 
          */
         protected function _tag_open_DIV($param, $other = 'div')
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add(strtoupper($other), true);
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse($other, $param);
@@ -2659,13 +2924,21 @@ 
 
             // for fieldset and legend
             if (in_array($other, array('fieldset', 'legend'))) {
-                if (isset($param['moveTop']))  $this->parsingCss->value['margin']['t']    += $param['moveTop'];
-                if (isset($param['moveLeft'])) $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
-                if (isset($param['moveDown'])) $this->parsingCss->value['margin']['b']    += $param['moveDown'];
+                if (isset($param['moveTop'])) {
+                	$this->parsingCss->value['margin']['t']    += $param['moveTop'];
+                }
+                if (isset($param['moveLeft'])) {
+                	$this->parsingCss->value['margin']['l']    += $param['moveLeft'];
+                }
+                if (isset($param['moveDown'])) {
+                	$this->parsingCss->value['margin']['b']    += $param['moveDown'];
+                }
             }
 
             $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             $marge = array();
             $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
@@ -2751,22 +3024,27 @@ 
                 if (
                     $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
                     $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
+                    ) {
+                                    $this->_tag_open_BR(array());
+                }
 
                 if (
                         ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
                         ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
+                    ) {
+                                    $this->_setNewPage();
+                }
 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -2775,8 +3053,11 @@ 
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -2825,7 +3106,9 @@ 
                         $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
                         break;
                 }
-                if ($xCorr>0) $xCorr=0;
+                if ($xCorr>0) {
+                	$xCorr=0;
+                }
                 switch($this->parsingCss->value['vertical-align'])
                 {
                     case 'bottom':
@@ -2909,7 +3192,9 @@ 
             // get height of LEGEND element and make fieldset corrections
             for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
                 $action = $this->parsingHtml->code[$tempPos];
-                if ($action['name'] == 'fieldset') break;
+                if ($action['name'] == 'fieldset') {
+                	break;
+                }
                 if ($action['name'] == 'legend' && !$action['close']) {
                     $legendOpenPos = $tempPos;
 
@@ -2922,8 +3207,9 @@ 
                         $action = $sub->parsingHtml->code[$sub->_parsePos];
                         $sub->_executeAction($action);
 
-                        if ($action['name'] == 'legend' && $action['close'])
-                            break;
+                        if ($action['name'] == 'legend' && $action['close']) {
+                                                    break;
+                        }
                     }
 
                     $legendH = $sub->_maxY;
@@ -2954,7 +3240,9 @@ 
          */
         protected function _tag_close_DIV($param, $other='div')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if ($this->parsingCss->value['overflow']=='hidden') {
                 $this->_maxX = $this->parsingCss->value['old_maxX'];
@@ -2964,8 +3252,9 @@ 
                 $this->pdf->clippingPathStop();
             }
 
-            if ($this->parsingCss->value['rotate'])
-                $this->pdf->stopTransform();
+            if ($this->parsingCss->value['rotate']) {
+                            $this->pdf->stopTransform();
+            }
 
             $marge = array();
             $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
@@ -3011,8 +3300,12 @@ 
             $this->parsingCss->fontSet();
             $this->_loadMargin();
 
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), false);
+            if ($block) {
+            	$this->_tag_open_BR(array());
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add(strtoupper($other), false);
+            }
 
             return true;
         }
@@ -3067,16 +3360,27 @@ 
             $lstBarcode['UPC_A']  =    'UPCA';
             $lstBarcode['CODE39'] =    'C39';
 
-            if (!isset($param['type']))     $param['type'] = 'C39';
-            if (!isset($param['value']))    $param['value']    = 0;
-            if (!isset($param['label']))    $param['label']    = 'label';
-            if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
+            if (!isset($param['type'])) {
+            	$param['type'] = 'C39';
+            }
+            if (!isset($param['value'])) {
+            	$param['value']    = 0;
+            }
+            if (!isset($param['label'])) {
+            	$param['label']    = 'label';
+            }
+            if (!isset($param['style']['color'])) {
+            	$param['style']['color'] = '#000000';
+            }
 
-            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
-                throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
+            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w']))) {
+                            throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
+            }
 
             $param['type'] = strtoupper($param['type']);
-            if (isset($lstBarcode[$param['type']])) $param['type'] = $lstBarcode[$param['type']];
+            if (isset($lstBarcode[$param['type']])) {
+            	$param['type'] = $lstBarcode[$param['type']];
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('barcode', $param);
@@ -3085,8 +3389,12 @@ 
 
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
-            $h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
+            $w = $this->parsingCss->value['width'];    if (!$w) {
+            	$w = $this->parsingCss->ConvertToMM('50mm');
+            }
+            $h = $this->parsingCss->value['height'];    if (!$h) {
+            	$h = $this->parsingCss->ConvertToMM('10mm');
+            }
             $txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
             $c = $this->parsingCss->value['color'];
             $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
@@ -3127,15 +3435,26 @@ 
          */
         protected function _tag_open_QRCODE($param)
         {
-            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
-                throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
+            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder']))) {
+                            throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
+            }
 
-            if ($this->_debugActif) $this->_DEBUG_add('QRCODE');
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('QRCODE');
+            }
 
-            if (!isset($param['value']))                     $param['value'] = '';
-            if (!isset($param['ec']))                        $param['ec'] = 'H';
-            if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
-            if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
+            if (!isset($param['value'])) {
+            	$param['value'] = '';
+            }
+            if (!isset($param['ec'])) {
+            	$param['ec'] = 'H';
+            }
+            if (!isset($param['style']['color'])) {
+            	$param['style']['color'] = '#000000';
+            }
+            if (!isset($param['style']['background-color'])) {
+            	$param['style']['background-color'] = '#FFFFFF';
+            }
             if (isset($param['style']['border'])) {
                 $borders = $param['style']['border']!='none';
                 unset($param['style']['border']);
@@ -3143,8 +3462,12 @@ 
                 $borders = true;
             }
 
-            if ($param['value']==='') return true;
-            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
+            if ($param['value']==='') {
+            	return true;
+            }
+            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) {
+            	$param['ec'] = 'H';
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('qrcode', $param);
@@ -3155,7 +3478,9 @@ 
             $y = $this->pdf->getY();
             $w = $this->parsingCss->value['width'];
             $h = $this->parsingCss->value['height'];
-            $size = max($w, $h); if (!$size) $size = $this->parsingCss->ConvertToMM('50mm');
+            $size = max($w, $h); if (!$size) {
+            	$size = $this->parsingCss->ConvertToMM('50mm');
+            }
 
             $style = array(
                     'fgcolor' => $this->parsingCss->value['color'],
@@ -3213,8 +3538,12 @@ 
             $titre = isset($param['title']) ? trim($param['title']) : '';
             $level = isset($param['level']) ? floor($param['level']) : 0;
 
-            if ($level<0) $level = 0;
-            if ($titre) $this->pdf->Bookmark($titre, $level, -1);
+            if ($level<0) {
+            	$level = 0;
+            }
+            if ($titre) {
+            	$this->pdf->Bookmark($titre, $level, -1);
+            }
 
             return true;
         }
@@ -3258,12 +3587,13 @@ 
             $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
 
             if ($this->parsingCss->value['text-transform']!='none') {
-                if ($this->parsingCss->value['text-transform']=='capitalize')
-                    $txt = ucwords($txt);
-                else if ($this->parsingCss->value['text-transform']=='uppercase')
-                    $txt = strtoupper($txt);
-                else if ($this->parsingCss->value['text-transform']=='lowercase')
-                    $txt = strtolower($txt);
+                if ($this->parsingCss->value['text-transform']=='capitalize') {
+                                    $txt = ucwords($txt);
+                } else if ($this->parsingCss->value['text-transform']=='uppercase') {
+                                    $txt = strtoupper($txt);
+                } else if ($this->parsingCss->value['text-transform']=='lowercase') {
+                                    $txt = strtolower($txt);
+                }
             }
 
             // size of the text
@@ -3319,7 +3649,9 @@ 
                     array_shift($words);
                     $old = $str;
 
-                    if (!count($words)) break;
+                    if (!count($words)) {
+                    	break;
+                    }
                     $str[0].= ' '.$words[0][0];
                     $str[1]+= $space+$words[0][1];
                 }
@@ -3336,7 +3668,9 @@ 
 
                 // write the extract sentence that fit on the page
                 $wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
-                if ($right - $left<$wc) $wc = $right - $left;
+                if ($right - $left<$wc) {
+                	$wc = $right - $left;
+                }
 
                 if (strlen($str[0])) {
                     $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
@@ -3357,7 +3691,9 @@ 
                 // if we have again words to write
                 if (count($words)) {
                     // remove the space at the end
-                    if ($add) $w-= $space;
+                    if ($add) {
+                    	$w-= $space;
+                    }
 
                     // if we don't add any word, and if the first word is empty => useless space to skip
                     if (!$add && $words[0][0]==='') {
@@ -3392,7 +3728,9 @@ 
                     // if more than 10000 line => error
                     $nb++;
                     if ($nb>10000) {
-                        $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+                        $txt = ''; foreach ($words as $k => $word) {
+                        	$txt.= ($k ? ' ' : '').$word[0];
+                        }
                         throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
                     }
 
@@ -3403,7 +3741,9 @@ 
 
             // if we have words after automatic cut, it is because they fit on the line => we write the text
             if (count($words)) {
-                $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+                $txt = ''; foreach ($words as $k => $word) {
+                	$txt.= ($k ? ' ' : '').$word[0];
+                }
                 $w+= $this->pdf->getWordSpacing()*(count($words));
                 $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
                 $this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
@@ -3431,11 +3771,15 @@ 
          */
         protected function _tag_open_BR($param, $curr = null)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
 
-            if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+            if ($this->_maxH==0) {
+            	$this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+            }
 
             $this->_makeBreakLine($h, $curr);
 
@@ -3454,11 +3798,15 @@ 
          */
         protected function _tag_open_HR($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
             $oldAlign = $this->parsingCss->value['text-align'];
             $this->parsingCss->value['text-align'] = 'left';
 
-            if ($this->_maxH) $this->_tag_open_BR($param);
+            if ($this->_maxH) {
+            	$this->_tag_open_BR($param);
+            }
 
             $fontSize = $this->parsingCss->value['font-size'];
             $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
@@ -3474,8 +3822,12 @@ 
             $this->parsingCss->fontSet();
 
             $h = $this->parsingCss->value['height'];
-            if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-            if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            if ($h) {
+            	$h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            }
+            if ($h<=0) {
+            	$h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            }
 
             $this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
             $this->_maxH = $h;
@@ -3811,7 +4163,9 @@ 
 
             if (isset($param['name'])) {
                 $name =     $param['name'];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                if (!isset($this->_lstAnchor[$name])) {
+                	$this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                }
 
                 if (!$this->_lstAnchor[$name][1]) {
                     $this->_lstAnchor[$name][1] = true;
@@ -3821,7 +4175,9 @@ 
 
             if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
                 $name = $match[1];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                if (!isset($this->_lstAnchor[$name])) {
+                	$this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                }
 
                 $this->_isInLink = $this->_lstAnchor[$name][0];
             }
@@ -3862,9 +4218,13 @@ 
          */
         protected function _tag_open_H1($param, $other = 'h1')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
-            if ($this->_maxH) $this->_tag_open_BR(array());
+            if ($this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
             $this->parsingCss->save();
             $this->parsingCss->value['font-bold'] = true;
 
@@ -3952,7 +4312,9 @@ 
          */
         protected function _tag_close_H1($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH+= $this->parsingCss->value['margin']['b'];
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
@@ -4119,10 +4481,14 @@ 
          */
         protected function _tag_open_P($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
+                if ($this->_maxH) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
             $this->parsingCss->save();
@@ -4159,9 +4525,13 @@ 
          */
         protected function _tag_close_P($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
-            if ($this->_maxH) $this->_tag_open_BR(array());
+            if ($this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
             $this->_isInParagraph = false;
             $this->_loadMargin();
             $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
@@ -4183,7 +4553,9 @@ 
          */
         protected function _tag_open_PRE($param, $other = 'pre')
         {
-            if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
+            if ($other=='pre' && $this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->value['font-family'] = 'courier';
@@ -4191,7 +4563,9 @@ 
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
-            if ($other=='pre') return $this->_tag_open_DIV($param, $other);
+            if ($other=='pre') {
+            	return $this->_tag_open_DIV($param, $other);
+            }
 
             return true;
         }
@@ -4220,7 +4594,9 @@ 
         protected function _tag_close_PRE($param, $other = 'pre')
         {
             if ($other=='pre') {
-                if ($this->_isForOneLine) return false;
+                if ($this->_isForOneLine) {
+                	return false;
+                }
 
                 $this->_tag_close_DIV($param, $other);
                 $this->_tag_open_BR(array());
@@ -4386,14 +4762,22 @@ 
          */
         protected function _tag_open_UL($param, $other = 'ul')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
+                if ($this->_maxH) {
+                	$this->_tag_open_BR(array());
+                }
+                if (!count($this->_defList)) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
-            if (!isset($param['style']['width'])) $param['allwidth'] = true;
+            if (!isset($param['style']['width'])) {
+            	$param['allwidth'] = true;
+            }
             $param['cellspacing'] = 0;
 
             // a list is like a table
@@ -4426,14 +4810,18 @@ 
          */
         protected function _tag_close_UL($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TABLE($param);
 
             $this->_listeDelLevel();
 
             if (!$this->_subPart) {
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
+                if (!count($this->_defList)) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
             return true;
@@ -4460,11 +4848,15 @@ 
          */
         protected function _tag_open_LI($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_listeAddLi();
 
-            if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
+            if (!isset($param['style']['width'])) {
+            	$param['style']['width'] = '100%';
+            }
 
             $paramPUCE = $param;
 
@@ -4518,8 +4910,11 @@ 
                 // TD for the puce
                 $this->_tag_open_TD($paramPUCE, 'li_sub');
                 unset($paramPUCE['style']['width']);
-                if (isset($paramPUCE['src']))    $this->_tag_open_IMG($paramPUCE);
-                else                            $this->_tag_open_WRITE($paramPUCE);
+                if (isset($paramPUCE['src'])) {
+                	$this->_tag_open_IMG($paramPUCE);
+                } else {
+                	$this->_tag_open_WRITE($paramPUCE);
+                }
                 $this->_tag_close_TD($paramPUCE);
             }
             $this->parsingCss->load();
@@ -4540,7 +4935,9 @@ 
          */
         protected function _tag_close_LI($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TD($param);
 
@@ -4558,7 +4955,9 @@ 
          */
         protected function _tag_open_TBODY($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tbody', $param);
@@ -4577,7 +4976,9 @@ 
          */
         protected function _tag_close_TBODY($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4594,7 +4995,9 @@ 
          */
         protected function _tag_open_THEAD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('thead', $param);
@@ -4607,9 +5010,13 @@ 
                 HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
                 for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
+                    if (strtolower($action['name'])=='thead') {
+                    	$action['name'] = 'thead_sub';
+                    }
                     HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
-                    if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
+                    if (strtolower($action['name'])=='thead_sub' && $action['close']) {
+                    	break;
+                    }
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
@@ -4629,7 +5036,9 @@ 
          */
         protected function _tag_close_THEAD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4653,7 +5062,9 @@ 
          */
         protected function _tag_open_TFOOT($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tfoot', $param);
@@ -4666,9 +5077,13 @@ 
                 HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
                 for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
+                    if (strtolower($action['name'])=='tfoot') {
+                    	$action['name'] = 'tfoot_sub';
+                    }
                     HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
+                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) {
+                    	break;
+                    }
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
@@ -4688,7 +5103,9 @@ 
          */
         protected function _tag_close_TFOOT($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4711,7 +5128,9 @@ 
          */
         protected function _tag_open_THEAD_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('thead', $param);
@@ -4729,7 +5148,9 @@ 
          */
         protected function _tag_close_THEAD_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4745,7 +5166,9 @@ 
          */
         protected function _tag_open_TFOOT_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tfoot', $param);
@@ -4763,7 +5186,9 @@ 
          */
         protected function _tag_close_TFOOT_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4825,7 +5250,9 @@ 
         protected function _tag_open_TABLE($param, $other = 'table')
         {
             if ($this->_maxH) {
-                if ($this->_isForOneLine) return false;
+                if ($this->_isForOneLine) {
+                	return false;
+                }
                 $this->_tag_open_BR(array());
             }
 
@@ -4837,15 +5264,21 @@ 
             $this->_maxH = 0;
 
             $alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
-            if (isset($param['align'])) unset($param['align']);
-            if (!in_array($alignObject, array('left', 'center', 'right'))) $alignObject = 'left';
+            if (isset($param['align'])) {
+            	unset($param['align']);
+            }
+            if (!in_array($alignObject, array('left', 'center', 'right'))) {
+            	$alignObject = 'left';
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse($other, $param);
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             // collapse table ?
             $collapse = false;
@@ -4866,7 +5299,9 @@ 
 
             // if we are in a SUB html => prepare the properties of the table
             if ($this->_subPart) {
-                if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
+                if ($this->_debugActif) {
+                	$this->_DEBUG_add('Table n'.$param['num'], true);
+                }
                 HTML2PDF::$_tables[$param['num']] = array();
                 HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
                 HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
@@ -4938,7 +5373,9 @@ 
          */
         protected function _tag_close_TABLE($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -4954,9 +5391,10 @@ 
                     foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
                         // hauteur de la ligne tr
                         $h = 0;
-                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
-                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
+                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++) {
+                                                    if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
                                 $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
+                        }
                         HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
                     }
                 }
@@ -4975,10 +5413,11 @@ 
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'];
                 $w = HTML2PDF::$_tables[$param['num']]['width'];
                 if ($parentWidth>$w) {
-                    if (HTML2PDF::$_tables[$param['num']]['align']=='center')
-                        $x = $x + ($parentWidth-$w)*0.5;
-                    else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
-                        $x = $x + $parentWidth-$w;
+                    if (HTML2PDF::$_tables[$param['num']]['align']=='center') {
+                                            $x = $x + ($parentWidth-$w)*0.5;
+                    } else if (HTML2PDF::$_tables[$param['num']]['align']=='right') {
+                                            $x = $x + $parentWidth-$w;
+                    }
 
                     HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
                 }
@@ -5001,8 +5440,12 @@ 
                 for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
 
                     // if it is a TR of the thead or of the tfoot => skip
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) continue;
+                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) {
+                    	continue;
+                    }
+                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) {
+                    	continue;
+                    }
 
                     // height of the line
                     $th = 0;
@@ -5010,13 +5453,16 @@ 
                     for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
                         $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
 
-                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
-                            $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1) {
+                                                    $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+                        }
                     }
 
                     // if the row does not fit on the page => new page
                     if ($y+$h+$height>$max) {
-                        if ($height==$h0) $height = null;
+                        if ($height==$h0) {
+                        	$height = null;
+                        }
                         HTML2PDF::$_tables[$param['num']]['height'][] = $height;
                         $height = $h0;
                         $y = $this->_margeTop;
@@ -5025,7 +5471,9 @@ 
                 }
 
                 // if ther is a height at the end, add it
-                if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+                if ($height!=$h0 || $k==0) {
+                	HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+                }
             } else {
                 // if we have tfoor, draw it
                 if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
@@ -5050,12 +5498,13 @@ 
 
                 // get the positions of the end of the table
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
-                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
-                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1) {
+                                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+                } else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1) {
+                                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+                } else {
+                                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+                }
 
                 $this->_maxX = max($this->_maxX, $x);
                 $this->_maxY = max($this->_maxY, $y);
@@ -5064,7 +5513,9 @@ 
 
                 $this->_loadMargin();
 
-                if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
+                if ($this->_debugActif) {
+                	$this->_DEBUG_add('Table '.$param['num'], false);
+                }
             }
 
             $this->parsingCss->load();
@@ -5084,8 +5535,9 @@ 
         protected function _tag_open_COL($param)
         {
             $span = isset($param['span']) ? $param['span'] : 1;
-            for ($k=0; $k<$span; $k++)
-                HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
+            for ($k=0; $k<$span; $k++) {
+                            HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
+            }
         }
 
         /**
@@ -5111,7 +5563,9 @@ 
          */
         protected function _tag_open_TR($param, $other = 'tr')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5215,12 +5669,14 @@ 
             } else {
                 // prepare it
                 HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
-                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
-                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
+                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']])) {
+                                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
+                }
 
                 HTML2PDF::$_tables[$param['num']]['corr_x']=0;
-                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
+                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
+                                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
+                }
             }
 
             return true;
@@ -5235,7 +5691,9 @@ 
          */
         protected function _tag_close_TR($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5273,7 +5731,9 @@ 
          */
         protected function _tag_open_TD($param, $other = 'td')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5328,10 +5788,11 @@ 
                     if (count($colParam['style']['width'])) {
                         $total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
                         foreach ($colParam['style']['width'] as $width) {
-                            if (substr($total, -1)=='%' && substr($width, -1)=='%')
-                                $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-                            else
-                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+                            if (substr($total, -1)=='%' && substr($width, -1)=='%') {
+                                                            $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
+                            } else {
+                                                            $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+                            }
                         }
                     }
 
@@ -5363,8 +5824,9 @@ 
                 $legacy = array();
 
                 $old = $this->parsingCss->getLastValue('background');
-                if ($old && ($old['color'] || $old['image']))
-                    $legacy['background'] = $old;
+                if ($old && ($old['color'] || $old['image'])) {
+                                    $legacy['background'] = $old;
+                }
 
                 if (HTML2PDF::$_tables[$param['num']]['border']) {
                     $legacy['border'] = array();
@@ -5395,7 +5857,9 @@ 
                 }
 
                 if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
-                    if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+                    if (!$return) {
+                    	$this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+                    }
                     $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
                 }
             }
@@ -5501,7 +5965,9 @@ 
          */
         protected function _tag_close_TD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5564,7 +6030,9 @@ 
          */
         protected function _tag_open_TH($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->value['font-bold'] = true;
@@ -5583,7 +6051,9 @@ 
          */
         protected function _tag_close_TH($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TD($param);
 
@@ -5613,7 +6083,9 @@ 
             $this->parsingCss->fontSet();
 
             $res = $this->_drawImage($src, isset($param['sub_li']));
-            if (!$res) return $res;
+            if (!$res) {
+            	return $res;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -5654,7 +6126,9 @@ 
             $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
             $this->_lstSelect['options']    = array();
 
-            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
+            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) {
+            	$this->_lstSelect['size'] = 3;
+            }
 
             return true;
         }
@@ -5707,7 +6181,9 @@ 
             $f = 1.08*$this->parsingCss->value['font-size'];
 
             // width
-            $w = $this->parsingCss->value['width']; if (!$w) $w = 50;
+            $w = $this->parsingCss->value['width']; if (!$w) {
+            	$w = 50;
+            }
 
             // height (automatic)
             $h = ($f*1.07*$this->_lstSelect['size'] + 1);
@@ -5820,9 +6296,15 @@ 
          */
         protected function _tag_open_INPUT($param)
         {
-            if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
-            if (!isset($param['value'])) $param['value'] = '';
-            if (!isset($param['type']))  $param['type']  = 'text';
+            if (!isset($param['name'])) {
+            	$param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
+            }
+            if (!isset($param['value'])) {
+            	$param['value'] = '';
+            }
+            if (!isset($param['type'])) {
+            	$param['type']  = 'text';
+            }
 
             $param['name'] = strtolower($param['name']);
             $param['type'] = strtolower($param['type']);
@@ -5856,7 +6338,9 @@ 
                 case 'checkbox':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
+                    if ($h<$f) {
+                    	$y+= ($f-$h)*0.5;
+                    }
                     $checked = (isset($param['checked']) && $param['checked']=='checked');
                     $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
                     break;
@@ -5864,7 +6348,9 @@ 
                 case 'radio':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
+                    if ($h<$f) {
+                    	$y+= ($f-$h)*0.5;
+                    }
                     $checked = (isset($param['checked']) && $param['checked']=='checked');
                     $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
                     break;
@@ -5877,29 +6363,43 @@ 
                     break;
 
                 case 'text':
-                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+                    $w = $this->parsingCss->value['width']; if (!$w) {
+                    	$w = 40;
+                    }
                     $h = $f*1.3;
                     $prop['value'] = $param['value'];
                     $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
                     break;
 
                 case 'submit':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'reset':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = array('S'=>'ResetForm');
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'button':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = isset($param['onclick']) ? $param['onclick'] : '';
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
@@ -5931,15 +6431,21 @@ 
          */
         protected function _tag_open_DRAW($param)
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('DRAW', true);
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('draw', $param);
             $this->parsingCss->fontSet();
 
             $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             $overW = $this->parsingCss->value['width'];
             $overH = $this->parsingCss->value['height'];
@@ -5954,22 +6460,27 @@ 
                 if (
                     $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
                     $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
+                    ) {
+                                    $this->_tag_open_BR(array());
+                }
 
                 if (
                         ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
                         ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
+                    ) {
+                                    $this->_setNewPage();
+                }
 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -5978,8 +6489,11 @@ 
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -6056,7 +6570,9 @@ 
          */
         protected function _tag_close_DRAW($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->pdf->SetAlpha(1.);
             $this->pdf->undoTransform();
@@ -6097,8 +6613,12 @@ 
             $this->parsingCss->fontSet();
             $this->_loadMargin();
 
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', false);
+            if ($block) {
+            	$this->_tag_open_BR(array());
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('DRAW', false);
+            }
 
             $this->_isInDraw = null;
 
@@ -6114,7 +6634,9 @@ 
          */
         protected function _tag_open_LINE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'LINE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'LINE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6141,7 +6663,9 @@ 
          */
         protected function _tag_open_RECT($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'RECT');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'RECT');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6168,7 +6692,9 @@ 
          */
         protected function _tag_open_CIRCLE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'CIRCLE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'CIRCLE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6193,7 +6719,9 @@ 
          */
         protected function _tag_open_ELLIPSE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'ELLIPSE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'ELLIPSE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6220,7 +6748,9 @@ 
          */
         protected function _tag_open_POLYLINE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'POLYGON');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6236,7 +6766,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6266,7 +6798,9 @@ 
          */
         protected function _tag_open_POLYGON($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'POLYGON');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6282,7 +6816,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6313,7 +6849,9 @@ 
          */
         protected function _tag_open_PATH($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'PATH');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'PATH');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6333,7 +6871,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6442,7 +6982,9 @@ 
          */
         protected function _tag_open_G($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'G');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'G');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();

includes/librairies/install.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -280,7 +280,7 @@ 
 	 *
 	 * @param integer $i The wpshop db version to execute operation for
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public static function execute_operation_on_db_for_update($i){
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
@@ -547,6 +547,7 @@ 
 
 	/**
 	 * Manage special operation on wpshop plugin update
+	 * @param integer $version
 	 */
 	public static function make_specific_operation_on_update($version){
 		global $wpdb, $wp_rewrite;

Indentation +5 added lines, -5 removed lines

@@ -23,10 +23,10 @@ 
 class wpshop_install {
 
 	/**
-	*	Define the action launch when plugin is activate
-	*
-	* @return void
-	*/
+	 *	Define the action launch when plugin is activate
+	 *
+	 * @return void
+	 */
 	public static function install_on_activation(){
 		/*	Create the different option needed for the plugin work properly	*/
 		add_option('wpshop_db_options', array('db_version' => 0));
@@ -442,7 +442,7 @@ 
 	 *
 	 * @param array $eav_content The complete array with all element to create into database
 	 * @param boolean $do_changes The current state of changes to do
-	 	*
+	 *
 	 * @return boolean If there are changes to do or not
 	 */
 	public static function update_eav_content( $eav_content, $do_changes ) {

Spacing +589 added lines, -589 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'));
 }
 
 /**
@@ -27,7 +27,7 @@ 
 	*
 	* @return void
 	*/
-	public static function install_on_activation(){
+	public static function install_on_activation() {
 		/*	Create the different option needed for the plugin work properly	*/
 		add_option('wpshop_db_options', array('db_version' => 0));
 		add_option('wpshop_shop_default_currency', WPSHOP_SHOP_DEFAULT_CURRENCY);
@@ -40,7 +40,7 @@ 
 	/**
 	 *	Create the default pages
 	 */
-	public static function wpshop_insert_default_pages( $pages_type = '' ) {
+	public static function wpshop_insert_default_pages($pages_type = '') {
 		global $wpdb, $wp_rewrite;
 
 		/**	if we will create any new pages we need to flush page cache */
@@ -57,48 +57,48 @@ 
 		);
 
 		/**	Get defined shop type	*/
-		$wpshop_shop_type = !empty( $pages_type ) ? $pages_type : get_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
+		$wpshop_shop_type = !empty($pages_type) ? $pages_type : get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
 		/**	Get the default datas for installation - Pages	*/
-		$xml_default_pages = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml' );
-		$defined_default_pages = new SimpleXMLElement( $xml_default_pages );
-		foreach ( $defined_default_pages->xpath( '//pages/page' ) as $page ) {
-			if ( ( $wpshop_shop_type == $page->attributes()->shop_type ) || ( 'sale' == $wpshop_shop_type ) ) {
+		$xml_default_pages = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml');
+		$defined_default_pages = new SimpleXMLElement($xml_default_pages);
+		foreach ($defined_default_pages->xpath('//pages/page') as $page) {
+			if (($wpshop_shop_type == $page->attributes()->shop_type) || ('sale' == $wpshop_shop_type)) {
 				$page_id = null;
 
 				/**	Do a specific check for cart page, for old wpshop installation	*/
-				if ( 'wpshop_cart_page_id' == (string)$page->attributes()->code ) {
+				if ('wpshop_cart_page_id' == (string)$page->attributes()->code) {
 					$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_content LIKE %s	AND post_type != %s", '%[wpshop_basket]%', 'revision');
 					$page_id = $wpdb->get_var($query);
 
-					wp_update_post( array(
+					wp_update_post(array(
 						'ID' => $page_id,
 						'post_content' => (string)$page->content,
-					) );
+					));
 				}
 
 				/**	Check if a page exists with the current content readed form xml file	*/
-				if ( empty( $page_id ) ) {
+				if (empty($page_id)) {
 					$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE %s AND post_type != %s", '%' . (string)$page->content . '%', 'revision');
 					$page_id = $wpdb->get_var($query);
 				}
 
 				/**	If the page does not exists create it	*/
-				if ( empty( $page_id ) ) {
-					$default_page_args  = wp_parse_args( array(
-						'post_title' 	=> __( (string)$page->title, 'wpshop' ),
-						'post_name' 	=> __( (string)$page->slug, 'wpshop' ),
-						'post_content' 	=> __( (string)$page->content, 'wpshop' ),
+				if (empty($page_id)) {
+					$default_page_args = wp_parse_args(array(
+						'post_title' 	=> __((string)$page->title, 'wpshop'),
+						'post_name' 	=> __((string)$page->slug, 'wpshop'),
+						'post_content' 	=> __((string)$page->content, 'wpshop'),
 						'menu_order' 	=> (string)$page->attributes()->position,
-					), $page_default_args );
+					), $page_default_args);
 
-					$page_id = wp_insert_post( $default_page_args );
+					$page_id = wp_insert_post($default_page_args);
 					$created_pages[] = (string)$page->attributes()->code;
 				}
 
 				/**	If the page is created or already exists associated the page to the good service	*/
-				if ( !empty( $page_id ) ) {
-					add_option( (string)$page->attributes()->code, $page_id );
+				if (!empty($page_id)) {
+					add_option((string)$page->attributes()->code, $page_id);
 
 					$page_creation = true;
 				}
@@ -107,18 +107,18 @@ 
 		}
 
 		/**	Check if page have been created in order to do specific action	*/
-		if ( !empty( $created_pages ) ) {
+		if (!empty($created_pages)) {
 			/**	If cart page and checkout page have just been created, change cart page id into checkout page id	*/
-			if ( in_array( 'wpshop_cart_page_id', $created_pages ) && in_array( 'wpshop_checkout_page_id', $created_pages ) ) {
-				update_option( 'wpshop_cart_page_id', get_option( 'wpshop_checkout_page_id' ) );
+			if (in_array('wpshop_cart_page_id', $created_pages) && in_array('wpshop_checkout_page_id', $created_pages)) {
+				update_option('wpshop_cart_page_id', get_option('wpshop_checkout_page_id'));
 			}
 
 		}
 
 		wp_cache_flush();
 		/** If new page => empty cache */
-		if ( $page_creation ) {
-			wp_cache_delete( 'all_page_ids', 'pages' );
+		if ($page_creation) {
+			wp_cache_delete('all_page_ids', 'pages');
 		//	$wp_rewrite->flush_rules();
 		}
 	}
@@ -138,54 +138,54 @@ 
 		);
 
 		/**	Get the default datas for installation - sample products	*/
-		$sample_datas = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml' );
-		$defined_sample_datas = new SimpleXMLElement( $sample_datas, LIBXML_NOCDATA );
+		$sample_datas = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml');
+		$defined_sample_datas = new SimpleXMLElement($sample_datas, LIBXML_NOCDATA);
 
 		$namespaces = $defined_sample_datas->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) )
+		if (!isset($namespaces['wp']))
 			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		if ( ! isset( $namespaces['excerpt'] ) )
+		if (!isset($namespaces['excerpt']))
 			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
 
-		foreach ( $defined_sample_datas->xpath( '//wpshop_products/wpshop_product' ) as $product ) {
-			$dc = $product->children( 'http://purl.org/dc/elements/1.1/' );
-			$content = $product->children( 'http://purl.org/rss/1.0/modules/content/' );
-			$excerpt = $product->children( $namespaces['excerpt'] );
-			$wp = $product->children( $namespaces['wp'] );
+		foreach ($defined_sample_datas->xpath('//wpshop_products/wpshop_product') as $product) {
+			$dc = $product->children('http://purl.org/dc/elements/1.1/');
+			$content = $product->children('http://purl.org/rss/1.0/modules/content/');
+			$excerpt = $product->children($namespaces['excerpt']);
+			$wp = $product->children($namespaces['wp']);
 
-			$product_args  = wp_parse_args( array(
+			$product_args = wp_parse_args(array(
 				'post_title' => (string)$product->title,
-				'post_name' => (string) $wp->post_name,
-				'post_content' => (string) $content->encoded,
-				'post_excerpt' => (string) $excerpt->encoded,
-				'post_type' => (string) $wp->post_type,
-			), $product_default_args );
+				'post_name' => (string)$wp->post_name,
+				'post_content' => (string)$content->encoded,
+				'post_excerpt' => (string)$excerpt->encoded,
+				'post_type' => (string)$wp->post_type,
+			), $product_default_args);
 
-			$product_id = wp_insert_post( $product_args );
+			$product_id = wp_insert_post($product_args);
 
-			foreach ( $wp->postmeta as $meta ) {
-				update_post_meta( $product_id, (string)$meta->meta_key, (string)$meta->meta_value);
+			foreach ($wp->postmeta as $meta) {
+				update_post_meta($product_id, (string)$meta->meta_key, (string)$meta->meta_value);
 			}
 
-			foreach ( $defined_sample_datas->xpath( '//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*' ) as $product_variation ) {
-				$wps_pdt_var_dc = $product_variation->children( 'http://purl.org/dc/elements/1.1/' );
-				$wps_pdt_var_content = $product_variation->children( 'http://purl.org/rss/1.0/modules/content/' );
-				$wps_pdt_var_excerpt = $product_variation->children( $namespaces['excerpt'] );
-				$wps_pdt_var_wp = $product_variation->children( $namespaces['wp'] );
+			foreach ($defined_sample_datas->xpath('//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*') as $product_variation) {
+				$wps_pdt_var_dc = $product_variation->children('http://purl.org/dc/elements/1.1/');
+				$wps_pdt_var_content = $product_variation->children('http://purl.org/rss/1.0/modules/content/');
+				$wps_pdt_var_excerpt = $product_variation->children($namespaces['excerpt']);
+				$wps_pdt_var_wp = $product_variation->children($namespaces['wp']);
 
-				$product_args  = wp_parse_args( array(
+				$product_args = wp_parse_args(array(
 						'post_title' => (string)$product_variation->title,
-						'post_name' => (string) $wps_pdt_var_wp->post_name,
-						'post_content' => (string) $wps_pdt_var_content->encoded,
-						'post_excerpt' => (string) $wps_pdt_var_excerpt->encoded,
-						'post_type' => (string) $wps_pdt_var_wp->post_type,
+						'post_name' => (string)$wps_pdt_var_wp->post_name,
+						'post_content' => (string)$wps_pdt_var_content->encoded,
+						'post_excerpt' => (string)$wps_pdt_var_excerpt->encoded,
+						'post_type' => (string)$wps_pdt_var_wp->post_type,
 						'post_parent' => $product_id,
-				), $product_default_args );
+				), $product_default_args);
 
-				$product_variation_id = wp_insert_post( $product_args );
+				$product_variation_id = wp_insert_post($product_args);
 
-				foreach ( $wps_pdt_var_wp->postmeta as $meta ) {
-					update_post_meta( $product_variation_id, (string)$meta->meta_key, (string)$meta->meta_value);
+				foreach ($wps_pdt_var_wp->postmeta as $meta) {
+					update_post_meta($product_variation_id, (string)$meta->meta_key, (string)$meta->meta_value);
 				}
 			}
 		}
@@ -219,17 +219,17 @@ 
 		$version_nb_delta = $current_def_max_version - $current_db_version;
 
 		/*	Check if there are modification to do	*/
-		if($current_def_max_version >= $current_db_version){
+		if ($current_def_max_version >= $current_db_version) {
 			/*	Check the lowest version of db to execute	*/
 			$lowest_version_to_execute = $current_def_max_version - $version_nb_delta;
 
-			for($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++){
+			for ($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++) {
 				$do_changes = self::execute_operation_on_db_for_update($i);
 			}
 		}
 
 		/*	Update the db version option value	*/
-		if($do_changes){
+		if ($do_changes) {
 			$db_version = get_option('wpshop_db_options', 0);
 			$db_version['db_version'] = $new_version;
 			update_option('wpshop_db_options', $db_version);
@@ -242,31 +242,31 @@ 
 	 * @param integer $i The current plugin db version
 	 * @return boolean If the changes are done correctly or not
 	 */
-	public static function alter_db_structure_on_update( $i ) {
+	public static function alter_db_structure_on_update($i) {
 		$do_changes = false;
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_request, $wpshop_db_delete;
 
 		/*	Check if there are modification to do	*/
-		if(isset($wpshop_update_way[$i])){
+		if (isset($wpshop_update_way[$i])) {
 			/*	Check if there are modification to make on table	*/
-			if(isset($wpshop_db_table_list[$i])){
-				foreach($wpshop_db_table_list[$i] as $table_name){
+			if (isset($wpshop_db_table_list[$i])) {
+				foreach ($wpshop_db_table_list[$i] as $table_name) {
 					dbDelta($wpshop_db_table[$table_name]);
 				}
 				$do_changes = true;
 			}
 
 			/*	Request maker	*/
-			if(isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)){
-				foreach($wpshop_db_request[$i] as $request){
+			if (isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)) {
+				foreach ($wpshop_db_request[$i] as $request) {
 					$wpdb->query($request);
 					$do_changes = true;
 				}
 			}
 
 			/*	Delete datas	*/
-			if(isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)){
-				foreach($wpshop_db_delete[$i] as $request){
+			if (isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)) {
+				foreach ($wpshop_db_delete[$i] as $request) {
 					$wpdb->query($request);
 				}
 			}
@@ -282,12 +282,12 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function execute_operation_on_db_for_update($i){
+	public static function execute_operation_on_db_for_update($i) {
 		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
 		$do_changes = false;
 
 		/*	Check if there are modification to do	*/
-		if(isset($wpshop_update_way[$i])){
+		if (isset($wpshop_update_way[$i])) {
 			$do_changes = self::alter_db_structure_on_update($i);
 
 
@@ -295,16 +295,16 @@ 
 			/*		Insert data		*/
 			/********************/
 			/*	Options content	*/
-			if(isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)){
-				foreach($wpshop_db_options_add[$i] as $option_name => $option_content){
+			if (isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)) {
+				foreach ($wpshop_db_options_add[$i] as $option_name => $option_content) {
 					add_option($option_name, $option_content, '', 'yes');
 				}
 				$do_changes = true;
 			}
-			if(isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)){
-				foreach($wpshop_db_options_update[$i] as $option_name => $option_content){
+			if (isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)) {
+				foreach ($wpshop_db_options_update[$i] as $option_name => $option_content) {
 					$option_current_content = get_option($option_name);
-					foreach($option_content as $option_key => $option_value){
+					foreach ($option_content as $option_key => $option_value) {
 						$option_current_content[$option_key] = $option_value;
 					}
 					update_option($option_name, $option_current_content);
@@ -313,18 +313,18 @@ 
 			}
 
 			/*	Eav content	*/
-			if(isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)){
+			if (isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)) {
 				$do_changes = self::add_content_to_eav($wpshop_eav_content[$i], $do_changes);
 			}
 			/*	Eav content update	*/
-			if(isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)){
+			if (isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)) {
 				$do_changes = self::add_content_to_eav($wpshop_eav_content_update[$i], $do_changes);
 			}
 
 			/*	Add datas	*/
-			if(isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)){
-				foreach($wpshop_db_content_add[$i] as $table_name => $def){
-					foreach($def as $information_index => $table_information){
+			if (isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)) {
+				foreach ($wpshop_db_content_add[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
 						$wpdb->insert($table_name, $table_information, '%s');
 						$do_changes = true;
 					}
@@ -332,9 +332,9 @@ 
 			}
 
 			/*	Update datas	*/
-			if(isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)){
-				foreach($wpshop_db_content_update[$i] as $table_name => $def){
-					foreach($def as $information_index => $table_information){
+			if (isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)) {
+				foreach ($wpshop_db_content_update[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
 						$wpdb->update($table_name, $table_information['datas'], $table_information['where'], '%s', '%s');
 						$do_changes = true;
 					}
@@ -355,54 +355,54 @@ 
 	 *
 	 * @return boolean If there are changes to do or not
 	 */
-	public static function add_content_to_eav( $eav_content, $do_changes ) {
+	public static function add_content_to_eav($eav_content, $do_changes) {
 		global $wpdb;
 		/*	Create entities if entites are set to be created for the current version	*/
-		if(isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)){
-			foreach($eav_content['entities'] as $entity){
+		if (isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)) {
+			foreach ($eav_content['entities'] as $entity) {
 				/*	Creation de l'entité produit dans la table des posts	*/
-				wpshop_entities::create_cpt_from_csv_file( $entity );
+				wpshop_entities::create_cpt_from_csv_file($entity);
 			}
 			$do_changes = true;
 		}
 
 		/*	Create attributes for a given entity if attributes are set to be created for current version	*/
 		if (!empty($eav_content['attributes']) && is_array($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
-			foreach($eav_content['attributes'] as $entity_code){
-				wpshop_entities::create_cpt_attributes_from_csv_file( $entity_code );
+			foreach ($eav_content['attributes'] as $entity_code) {
+				wpshop_entities::create_cpt_attributes_from_csv_file($entity_code);
 			}
 			$do_changes = true;
 		}
 
 		/*	Create attribute groups for a given entity if attributes groups are set to be created for current version	*/
-		if(isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)){
-			foreach($eav_content['attribute_groups'] as $entity_code => $attribute_set){
+		if (isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
 				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
 
-				if($entity_id > 0){
-					foreach($attribute_set as $set_name => $set_groups){
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
 						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
 						$attribute_set_id = $wpdb->get_var($query);
-						if($attribute_set_id <= 0){
+						if ($attribute_set_id <= 0) {
 							$attribute_set_content = array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name);
-							if($set_name == 'default'){
+							if ($set_name == 'default') {
 								$attribute_set_content['default_set'] = 'yes';
 							}
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, $attribute_set_content);
 							$attribute_set_id = $wpdb->insert_id;
 						}
 
-						if($attribute_set_id > 0){
-							foreach($set_groups as $set_group_infos){
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
 								$set_group_infos_details = $set_group_infos['details'];
 								unset($set_group_infos['details']);
 								/*	Change an attribute set status if definition specify this param 	*/
-								if(isset($set_group_infos['status'])){
+								if (isset($set_group_infos['status'])) {
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
 								}
 								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
 								$attribute_set_section_id = $wpdb->get_var($query);
-								if($attribute_set_section_id <= 0){
+								if ($attribute_set_section_id <= 0) {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
 									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
@@ -411,15 +411,15 @@ 
 									$attribute_set_section_id = $wpdb->insert_id;
 								}
 
-								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))){
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))) {
 									$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 									$last_position = $wpdb->get_var($query);
 									$position = (int)$last_position + 1;
-									foreach($set_group_infos_details as $attribute_code){
+									foreach ($set_group_infos_details as $attribute_code) {
 										$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
 										$attribute_id = $wpdb->get_row($query);
 
-										if($attribute_id->id > 0){
+										if ($attribute_id->id > 0) {
 											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id->id, 'position' => $position));
 											$position++;
 										}
@@ -445,13 +445,13 @@ 
 	 	*
 	 * @return boolean If there are changes to do or not
 	 */
-	public static function update_eav_content( $eav_content, $do_changes ) {
+	public static function update_eav_content($eav_content, $do_changes) {
 		/*	Update attributes fo a given entity if attributes are set to be updated for current version	*/
-		if(isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)){
-			foreach($eav_content['attributes'] as $entity_code => $attribute_definition){
-				foreach($attribute_definition as $attribute_def){
+		if (isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
+			foreach ($eav_content['attributes'] as $entity_code => $attribute_definition) {
+				foreach ($attribute_definition as $attribute_def) {
 					$option_list_for_attribute = '';
-					if(isset($attribute_def['backend_input_values'])){
+					if (isset($attribute_def['backend_input_values'])) {
 						$option_list_for_attribute = $attribute_def['backend_input_values'];
 						unset($attribute_def['backend_input_values']);
 					}
@@ -465,10 +465,10 @@ 
 					$attribute_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_def['code']));
 
 					/*	Insert option values if there are some to add for the current attribute	*/
-					if(($option_list_for_attribute != '') && (is_array($option_list_for_attribute))){
-						foreach($option_list_for_attribute as $option_code => $option_value){
+					if (($option_list_for_attribute != '') && (is_array($option_list_for_attribute))) {
+						foreach ($option_list_for_attribute as $option_code => $option_value) {
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'label' => ((substr($option_code, 0, 2) != '__') ? $option_value : __(substr($option_code, 2), 'wpshop')), 'value' => $option_value));
-							if($option_code == $attribute_def['default_value']){
+							if ($option_code == $attribute_def['default_value']) {
 								$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $wpdb->insert_id), array('id' => $attribute_id, 'default_value' => $option_code));
 							}
 						}
@@ -479,30 +479,30 @@ 
 		}
 
 		/*	Update attribute groups fo a given entity if attributes groups are set to be updated for current version	*/
-		if(is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)){
-			foreach($eav_content['attribute_groups'] as $entity_code => $attribute_set){
+		if (is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
 				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
 
-				if($entity_id > 0){
-					foreach($attribute_set as $set_name => $set_groups){
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
 						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
 						$attribute_set_id = $wpdb->get_var($query);
-						if($attribute_set_id <= 0){
+						if ($attribute_set_id <= 0) {
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name));
 							$attribute_set_id = $wpdb->insert_id;
 						}
 
-						if($attribute_set_id > 0){
-							foreach($set_groups as $set_group_infos){
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
 								$set_group_infos_details = $set_group_infos['details'];
 								unset($set_group_infos['details']);
 								/*	Change an attribute set status if definition specify this param 	*/
-								if(isset($set_group_infos['status'])){
+								if (isset($set_group_infos['status'])) {
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
 								}
 								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
 								$attribute_set_section_id = $wpdb->get_var($query);
-								if($attribute_set_section_id <= 0){
+								if ($attribute_set_section_id <= 0) {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
 									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
@@ -510,24 +510,24 @@ 
 									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
 									$attribute_set_section_id = $wpdb->insert_id;
 								}
-								else{
+								else {
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['last_update_date'] = current_time('mysql', 0);
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
 								}
 
-								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))){
-									if(count($set_group_infos_details) <= 0){
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))) {
+									if (count($set_group_infos_details) <= 0) {
 										$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
 									}
-									else{
+									else {
 										$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 										$last_position = $wpdb->get_var($query);
 										$position = (int)$last_position + 1;
-										foreach($set_group_infos_details as $attribute_code){
+										foreach ($set_group_infos_details as $attribute_code) {
 											$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
 											$attribute_id = $wpdb->get_var($query);
-											if($attribute_id > 0){
+											if ($attribute_id > 0) {
 												$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id, 'position' => $position));
 												$position++;
 											}
@@ -548,11 +548,11 @@ 
 	/**
 	 * Manage special operation on wpshop plugin update
 	 */
-	public static function make_specific_operation_on_update($version){
+	public static function make_specific_operation_on_update($version) {
 		global $wpdb, $wp_rewrite;
 		$wpshop_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
-		switch($version){
+		switch ($version) {
 			case 3:
 			case 6:
  				self::wpshop_insert_default_pages($wpshop_shop_type);
@@ -561,38 +561,38 @@ 
 			break;
 			case 8:
 				/**	Change metaboxes order for product in case it already exists	*/
-				$query = $wpdb->prepare( "SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product' );
-				$customer_metaboxes_order = $wpdb->get_results( $query );
-				if ( !empty( $customer_metaboxes_order ) ) {
-					foreach ( $customer_metaboxes_order as $customer_metabox_order ) {
+				$query = $wpdb->prepare("SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product');
+				$customer_metaboxes_order = $wpdb->get_results($query);
+				if (!empty($customer_metaboxes_order)) {
+					foreach ($customer_metaboxes_order as $customer_metabox_order) {
 						$do_changes = false;
-						$current_order = unserialize( $customer_metabox_order->meta_value );
-						if ( array_key_exists( 'normal', $current_order ) && ( false !== strpos( 'wpshop_product_important_datas', $current_order[ 'normal' ] ) ) ) {
-							str_replace( 'wpshop_product_important_datas,', '', $current_order[ 'normal' ] );
+						$current_order = unserialize($customer_metabox_order->meta_value);
+						if (array_key_exists('normal', $current_order) && (false !== strpos('wpshop_product_important_datas', $current_order['normal']))) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['normal']);
 							$do_changes = true;
 						}
 
-						if ( array_key_exists( 'side', $current_order ) ) {
-							str_replace( 'wpshop_product_important_datas,', '', $current_order[ 'side' ] );
-							str_replace( 'submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order[ 'side' ] );
+						if (array_key_exists('side', $current_order)) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['side']);
+							str_replace('submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order['side']);
 							$do_changes = true;
 						}
 
-						if ( true === $do_changes ) {
-							$wpdb->update( $wpdb->usermeta, array( 'meta_value' => serialize( $current_order ), ), array( 'umeta_id' => $customer_metabox_order->umeta_id ) );
+						if (true === $do_changes) {
+							$wpdb->update($wpdb->usermeta, array('meta_value' => serialize($current_order),), array('umeta_id' => $customer_metabox_order->umeta_id));
 						}
 					}
 				}
 				else {
-					$users = get_users( array( 'role' => 'administrator', ) );
-					if ( !empty( $users ) ) {
-						foreach ( $users as $user ) {
+					$users = get_users(array('role' => 'administrator',));
+					if (!empty($users)) {
+						foreach ($users as $user) {
 							$user_meta = array(
 								'side' => 'submitdiv,formatdiv,wpshop_product_important_datas,wpshop_product_categorydiv,pageparentdiv,wps_barcode_product,wpshop_product_actions,wpshop_product_options,postimagediv',
 								'normal' => 'wpshop_product_fixed_tab,postexcerpt,trackbacksdiv,postcustom,commentstatusdiv,slugdiv,authordiv,wpshop_wpshop_variations,wps_media_manager,wpshop_product_order_historic',
 								'advanced' => '',
 							);
-							update_user_meta( $user->ID, 'meta-box-order_wpshop_product', $user_meta );
+							update_user_meta($user->ID, 'meta-box-order_wpshop_product', $user_meta);
 						}
 					}
 				}
@@ -608,7 +608,7 @@ 
 				$tax_id = $wpdb->get_var($wpdb->prepare("SELECT ATT_OPT.id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT WHERE attribute_id = %d AND value = '20'", $product_prices->tx_tva));
 				$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " WHERE attribute_id = %d", $product_prices->product_price);
 				$price_list = $wpdb->get_results($query);
-				foreach($price_list as $existing_ttc_price){
+				foreach ($price_list as $existing_ttc_price) {
 					$tax_rate = 1.20;
 					$price_ht = $existing_ttc_price->value / $tax_rate;
 					$tax_amount = $existing_ttc_price->value - $price_ht;
@@ -619,24 +619,24 @@ 
 				}
 
 				/*	Update orders structure into database	*/
-				$orders_id = $wpdb->get_results('SELECT ID FROM '.$wpdb->posts.' WHERE post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"');
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
 				foreach ($orders_id as $o) {
 					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
 					$neworder = array();
 					$items = array();
 
-					if(!isset($myorder['order_tva'])){
+					if (!isset($myorder['order_tva'])) {
 						$order_total_ht = 0;
 						$order_total_ttc = 0;
 						$order_tva = array('20'=>0);
 
 						foreach ($myorder['order_items'] as $item) {
 							/* item */
-							$pu_ht = $item['cost']/1.20;
-							$pu_tva = $item['cost']-$pu_ht;
-							$total_ht = $pu_ht*$item['qty'];
-							$tva_total_amount = $pu_tva*$item['qty'];
-							$total_ttc = $item['cost']*$item['qty'];
+							$pu_ht = $item['cost'] / 1.20;
+							$pu_tva = $item['cost'] - $pu_ht;
+							$total_ht = $pu_ht * $item['qty'];
+							$tva_total_amount = $pu_tva * $item['qty'];
+							$total_ttc = $item['cost'] * $item['qty'];
 							/* item */
 							$order_total_ht += $total_ht;
 							$order_total_ttc += $total_ttc;
@@ -683,7 +683,7 @@ 
 							'order_total_ttc' => $order_total_ttc,
 							'order_grand_total' => $order_total_ttc,
 							'order_shipping_cost' => number_format(0, 2, '.', ''),
-							'order_tva' => array_map(array( 'wpshop_tools', 'number_format_hack' ), $order_tva),
+							'order_tva' => array_map(array('wpshop_tools', 'number_format_hack'), $order_tva),
 							'order_items' => $items
 						);
 						/* Update the order postmeta */
@@ -698,29 +698,29 @@ 
 			case 12:
 				$query = "SELECT ID FROM " . $wpdb->users;
 				$user_list = $wpdb->get_results($query);
-				foreach($user_list as $user){
+				foreach ($user_list as $user) {
 					$user_first_name = get_user_meta($user->ID, 'first_name', true);
 					$user_last_name = get_user_meta($user->ID, 'last_name', true);
 					$shipping_info = get_user_meta($user->ID, 'shipping_info', true);
 
-					if(($user_first_name == '') && !empty($shipping_info['first_name'])){
+					if (($user_first_name == '') && !empty($shipping_info['first_name'])) {
 						update_user_meta($user->ID, 'first_name', $shipping_info['first_name']);
 					}
 
-					if(($user_last_name == '') && !empty($shipping_info['last_name'])){
+					if (($user_last_name == '') && !empty($shipping_info['last_name'])) {
 						update_user_meta($user->ID, 'last_name', $shipping_info['last_name']);
 					}
 				}
 
 				/*	Update orders structure into database	*/
-				$orders_id = $wpdb->get_results('SELECT ID FROM '.$wpdb->posts.' WHERE post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"');
-				foreach($orders_id as $o){
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
+				foreach ($orders_id as $o) {
 					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
-					if(!empty($myorder)){
+					if (!empty($myorder)) {
 						$new_items = array();
-						foreach($myorder['order_items'] as $item){
+						foreach ($myorder['order_items'] as $item) {
 							$new_items = $item;
-							$new_items['item_discount_type'] = !empty($item['item_discount_rate'])?$item['item_discount_rate']:'amount';
+							$new_items['item_discount_type'] = !empty($item['item_discount_rate']) ? $item['item_discount_rate'] : 'amount';
 							// unset($new_items['item_discount_rate']);
 							$new_items['item_discount_value'] = 0;
 						}
@@ -740,12 +740,12 @@ 
 			break;
 			case 13:
 				$attribute_used_for_sort_by = wpshop_attributes::getElement('yes', "'valid', 'moderated', 'notused'", 'is_used_for_sort_by', true);
-				foreach($attribute_used_for_sort_by as $attribute){
+				foreach ($attribute_used_for_sort_by as $attribute) {
 					$data = query_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-					foreach($data as $post){
+					foreach ($data as $post) {
 						$postmeta = get_post_meta($post->ID, '_wpshop_product_metadata', true);
-						if(!empty($postmeta[$attribute->code])) {
-							update_post_meta($post->ID, '_'.$attribute->code, $postmeta[$attribute->code]);
+						if (!empty($postmeta[$attribute->code])) {
+							update_post_meta($post->ID, '_' . $attribute->code, $postmeta[$attribute->code]);
 						}
 					}
 					wp_reset_query();
@@ -758,9 +758,9 @@ 
 				);
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = %s", 'yes');
 				$default_attribute_set = $wpdb->get_var($query);
-				foreach($products as $product){
+				foreach ($products as $product) {
 					$p_att_set_id = get_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
-					if(empty($p_att_set_id)){
+					if (empty($p_att_set_id)) {
 						/*	Update the attribute set id for the current product	*/
 						update_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $default_attribute_set);
 					}
@@ -786,16 +786,16 @@ 
 				 */
 				$query = $wpdb->prepare("SELECT ATTR_OPT.id, ATTR_OPT.value, ATTR_OPT.label, ATTR_OPT.position, ATTR_OPT.attribute_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATTR_OPT INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = ATTR_OPT.attribute_id) WHERE ATTR_OPT.status=%s AND ATTR.code=%s", 'valid', 'manage_stock');
 				$manage_stock_option = $wpdb->get_results($query);
-				if( !empty( $manage_stock_option ) ){
+				if (!empty($manage_stock_option)) {
 					$no_is_present = false;
 					$attribute_id = $manage_stock_option[0]->attribute_id;
 					foreach ($manage_stock_option as $manage_definition) {
-						if( strtolower( __( $manage_definition->value, 'wpshop' ) ) == strtolower( __( 'no', 'wpshop' ) ) ) {
+						if (strtolower(__($manage_definition->value, 'wpshop')) == strtolower(__('no', 'wpshop'))) {
 							$no_is_present = true;
 						}
 					}
-					if ( !$no_is_present ) {
-						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql',0), 'last_update_date'=>current_time('mysql',0),'attribute_id'=>$attribute_id, 'value'=>'no', 'label'=>__('No', 'wpshop')));
+					if (!$no_is_present) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'last_update_date'=>current_time('mysql', 0), 'attribute_id'=>$attribute_id, 'value'=>'no', 'label'=>__('No', 'wpshop')));
 					}
 				}
 
@@ -814,29 +814,29 @@ 
 WHERE ATTR_DET.attribute_id IN (" . $attribute_ids . ")"
 						, 'prices', __('default', 'wpshop'));
 				$list = $wpdb->get_results($query);
-				if(!empty($list)){
+				if (!empty($list)) {
 					$change_order = true;
 					$old_value = $list[0]->attribute_group_id;
 					unset($list[0]);
-					if(!empty($list)){
+					if (!empty($list)) {
 						foreach ($list as $data) {
-							if ( $old_value !=  $data->attribute_group_id) {
+							if ($old_value != $data->attribute_group_id) {
 								$change_order = false;
 							}
 						}
 						if ($change_order) {
-							foreach($price_tab as $price_code){
+							foreach ($price_tab as $price_code) {
 								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $price_code);
 								$attribute_id = $wpdb->get_var($query);
-								switch($price_code){
+								switch ($price_code) {
 									case WPSHOP_PRODUCT_PRICE_HT:
-										$position = ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) ? 1 : 3;
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 1 : 3;
 										break;
 									case WPSHOP_PRODUCT_PRICE_TAX:
 										$position = 2;
 										break;
 									case WPSHOP_PRODUCT_PRICE_TTC:
-										$position = ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) ? 3 : 1;
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 3 : 1;
 										break;
 									case WPSHOP_PRODUCT_PRICE_TAX_AMOUNT:
 										$position = 4;
@@ -852,7 +852,7 @@ 
 			case 22:
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 				$product_entity_id = $wpdb->get_var($query);
-				if(empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id){
+				if (empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id) {
 					/*	Create the product entity into post table	*/
 					$product_entity = array(
 						'post_title' => __('Products', 'wpshop'),
@@ -862,7 +862,7 @@ 
 						'post_author' => 1,
 						'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES
 					);
-					$product_entity_id = wp_insert_post( $product_entity );
+					$product_entity_id = wp_insert_post($product_entity);
 				}
 
 				/*	Update eav table with the new entity id for product	*/
@@ -886,12 +886,12 @@ 
 			break;
 			case 23:
 				/*	Delete duplicate entities	*/
-				$query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%".WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT."%' ");
+				$query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "%' ");
 				$product_entity_list = $wpdb->get_results($query);
-				if ( count($product_entity_list) > 1 ) {
+				if (count($product_entity_list) > 1) {
 					$i = 0;
-					foreach($product_entity_list as $product_entity){
-						if ($i>0) {
+					foreach ($product_entity_list as $product_entity) {
+						if ($i > 0) {
 							wp_delete_post($product_entity->ID);
 						}
 					}
@@ -902,16 +902,16 @@ 
 				/*	Update the link status for disabled attribute set	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE status = %s", 'deleted');
 				$deleted_attribute_group = $wpdb->get_results($query);
-				if(!empty($deleted_attribute_group)) {
-					foreach($deleted_attribute_group as $group){
+				if (!empty($deleted_attribute_group)) {
+					foreach ($deleted_attribute_group as $group) {
 						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0)), array('attribute_group_id' => $group->id));
 					}
 				}
 
 				/*	Update entities meta management	*/
 				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES));
-				if(!empty($entities)){
-					foreach($entities as $entity){
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
 						$support = get_post_meta($entity->ID, '_wpshop_entity_support', true);
 						$rewrite = get_post_meta($entity->ID, '_wpshop_entity_rewrite', true);
 						update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => array('slug' => $rewrite)));
@@ -931,7 +931,7 @@ 
 				/*	Get entities that have been created a lot of time and delete them	*/
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE (post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%%' OR post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%%') AND post_type=%s", WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 				$entities_to_delete = $wpdb->get_results($query);
-				if ( !empty($entities_to_delete) && is_array($entities_to_delete) ) {
+				if (!empty($entities_to_delete) && is_array($entities_to_delete)) {
 					foreach ($entities_to_delete as $entity) {
 						wp_delete_post($entity->ID, true);
 					}
@@ -940,14 +940,14 @@ 
 				/*	Get post list that are children of entities created a lot of time */
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%");
 				$entities_to_update = $wpdb->get_results($query);
-				if ( !empty($entities_to_update) && is_array($entities_to_update) ) {
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
 					foreach ($entities_to_update as $entity) {
 						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
 					}
 				}
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%");
 				$entities_to_update = $wpdb->get_results($query);
-				if ( !empty($entities_to_update) && is_array($entities_to_update) ) {
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
 					foreach ($entities_to_update as $entity) {
 						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
 					}
@@ -955,12 +955,12 @@ 
 
 				/*	Change addons managament	*/
 				$wpshop_addons_options = get_option('wpshop_addons_state', array());
-				if ( !empty($wpshop_addons_options) ) {
-					foreach ($wpshop_addons_options as $addon_name => $addon_state ) {
+				if (!empty($wpshop_addons_options)) {
+					foreach ($wpshop_addons_options as $addon_name => $addon_state) {
 						$options_args = array();
 						$options_args[$addon_name]['activate'] = $addon_state;
 						$options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
-						if (! $addon_state ) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						if (!$addon_state) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
 						add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
 					}
 					delete_option('wpshop_addons_state');
@@ -973,7 +973,7 @@ 
 				return true;
 			break;
 			case 26:
-				$query = "SELECT post_id, meta_value FROM " .$wpdb->postmeta. " WHERE meta_key = '_order_postmeta' ";
+				$query = "SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = '_order_postmeta' ";
 				$results = $wpdb->get_results($query);
 				foreach ($results as $result) {
 					$order_info = unserialize($result->meta_value);
@@ -990,36 +990,36 @@ 
 			break;
 
 			case 29:
-				$billing_title = __( 'Billing address', 'wpshop' );
-				$shipping_title = __( 'Shipping address', 'wpshop' );
+				$billing_title = __('Billing address', 'wpshop');
+				$shipping_title = __('Shipping address', 'wpshop');
 
 				//UPDATE USERS ADDRESSES
-				$billing_address_set_id_query = 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .$billing_title. '"';
-				$shipping_address_set_id_query = 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .$shipping_title. '"';
+				$billing_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $billing_title . '"';
+				$shipping_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $shipping_title . '"';
 
 				$billing_address_set_id = $wpdb->get_var($billing_address_set_id_query);
 				$shipping_address_set_id = $wpdb->get_var($shipping_address_set_id_query);
 
 
 				//Add Address & Google Map API KEY options
-				add_option( 'wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes' );
-				add_option( 'wpshop_shipping_address_choice', array('activate'=>'on', 'choice'=> $shipping_address_set_id), '', 'yes' );
-				add_option( 'wpshop_google_map_api_key', '', '', 'yes' );
+				add_option('wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes');
+				add_option('wpshop_shipping_address_choice', array('activate'=>'on', 'choice'=> $shipping_address_set_id), '', 'yes');
+				add_option('wpshop_google_map_api_key', '', '', 'yes');
 
 
 
-				$query = 'SELECT * FROM ' .$wpdb->users. '';
+				$query = 'SELECT * FROM ' . $wpdb->users . '';
 				$results = $wpdb->get_results($query);
 				foreach ($results as $result) {
-					$billing_infos = get_user_meta( $result->ID, 'billing_info', true );
-					$shipping_infos = get_user_meta( $result->ID, 'shipping_info', true );
-					if ( !empty($billing_infos) ) {
+					$billing_infos = get_user_meta($result->ID, 'billing_info', true);
+					$shipping_infos = get_user_meta($result->ID, 'shipping_info', true);
+					if (!empty($billing_infos)) {
 						//Save Billing Infos
 						$billing_address = array();
-						if ( !empty($billing_infos['civility']) ) {
-							switch ( $billing_infos['civility'] ) {
+						if (!empty($billing_infos['civility'])) {
+							switch ($billing_infos['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 								break;
 								case 2:
 									$civility = $madam_id;
@@ -1030,7 +1030,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($billing_infos['last_name']) ? $billing_infos['last_name'] : '',
@@ -1058,16 +1058,16 @@ 
 						$post_address_id = wp_insert_post($post_address);
 
 						//Create the post_meta with the address infos
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', $billing_address);
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_attribute_set_id', $billing_address_set_id);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $billing_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $billing_address_set_id);
 					}
 
-					if ( !empty($shipping_infos) ) {
+					if (!empty($shipping_infos)) {
 						//Save Shipping Infos
-						if ( !empty($shipping_infos['civility']) ) {
-							switch ( $shipping_infos['civility'] ) {
+						if (!empty($shipping_infos['civility'])) {
+							switch ($shipping_infos['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1078,7 +1078,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$shipping_address = array();
 						$shipping_address = array('address_title' => $shipping_title,
@@ -1103,22 +1103,22 @@ 
 						);
 						$post_address_id = wp_insert_post($post_address);
 						//Create the post_meta with the address infos
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', $shipping_address);
-						update_post_meta($post_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_attribute_set_id', $shipping_address_set_id);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $shipping_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $shipping_address_set_id);
 					}
 				}
 
 				// FORMATE THE ORDER ADDRESSES INFOS
-				$results = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1) );
-				foreach ( $results as $result ) {
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
 					$address = get_post_meta($result->ID, '_order_info', true);
 
 					$billing_address = array();
-					if ( !empty($address['billing']) ) {
-						if ( !empty($address['billing']['civility']) ) {
-							switch ( $address['billing']['civility'] ) {
+					if (!empty($address['billing'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1127,12 +1127,12 @@ 
 									$civility = $miss_id;
 									break;
 								default:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
@@ -1151,11 +1151,11 @@ 
 					}
 
 					$shipping_address = array();
-					if ( !empty($address['shipping']) ) {
-						if ( !empty($address['shipping']['civility']) ) {
-							switch ( $address['shipping']['civility'] ) {
+					if (!empty($address['shipping'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1166,7 +1166,7 @@ 
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$shipping_address = array('address_title' => $shipping_title,
 							'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
@@ -1191,11 +1191,11 @@ 
 
 				/*	Update entities meta management	*/
 				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'posts_per_page' => -1));
-				if(!empty($entities)){
-					foreach($entities as $entity){
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
 						$params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
-						$support = ( !empty($params['support']) ) ? $params['support'] : '';
-						$rewrite = ( !empty($params['rewrite']) ) ? $params['rewrite'] : '';
+						$support = (!empty($params['support'])) ? $params['support'] : '';
+						$rewrite = (!empty($params['rewrite'])) ? $params['rewrite'] : '';
 
 						$display_admin_menu = 'on';
 
@@ -1205,35 +1205,35 @@ 
 				wp_reset_query();
 
 				// Default Weight unity and Currency Options
-				add_option( 'wpshop_shop_weight_group', 3, '', 'yes' );
-				add_option( 'wpshop_shop_default_weight_unity', 6, '', 'yes' );
-				add_option( 'wpshop_shop_currency_group', 4, '', 'yes' );
+				add_option('wpshop_shop_weight_group', 3, '', 'yes');
+				add_option('wpshop_shop_default_weight_unity', 6, '', 'yes');
+				add_option('wpshop_shop_currency_group', 4, '', 'yes');
 
 				$default_currency = get_option('wpshop_shop_default_currency');
-				foreach ( unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v ) {
-					if ( $default_currency == $k ) {
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
 						$symbol = $v;
 					}
 				}
-				if ( !empty($symbol) ) {
-					$query = 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE name = "'.html_entity_decode($symbol, ENT_QUOTES, 'UTF-8').'"';
+				if (!empty($symbol)) {
+					$query = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"';
 					$currency = $wpdb->get_row($query);
-					if ( !empty($currency) ) {
+					if (!empty($currency)) {
 						update_option('wpshop_shop_default_currency', $currency->id);
 						// Update the change rate of the default currency
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id) );
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
 					}
 				}
 
 				// Update the field for variation and user definition field
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes') );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes'));
 				// Update field type for frontend output selection
 				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'text'), array());
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select') );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select'));
 
-				add_option('wpshop_cart_option', array( 'product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')) );
+				add_option('wpshop_cart_option', array('product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')));
 
 				return true;
 			break;
@@ -1247,22 +1247,22 @@ 
 				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_reference'));
 
 				/**	Insert new message for admin when a customer make an order	*/
-				$admin_new_order_message = get_option( 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' );
-				if ( empty($admin_new_order_message) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' );
+				$admin_new_order_message = get_option('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
+				if (empty($admin_new_order_message)) {
+					wps_message_ctr::createMessage('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
 				}
 				/**	Update all amount for paypal orders	*/
 				$query = $wpdb->prepare("SELECT post_id FROM " . $wpdb->postmeta . " WHERE meta_key = %s AND meta_value = %s ", '_wpshop_payment_method', 'paypal');
-				$paypal_payment_list = $wpdb->get_results( $query );
-				if ( !empty($paypal_payment_list) ) {
-					foreach ( $paypal_payment_list as $post ) {
-						$order_meta = get_post_meta( $post->post_id, '_order_postmeta', true );
-						$order_payment_meta = get_post_meta( $post->post_id, 'wpshop_payment_return_data', true );
-						if ( !empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount') ) {
-							if ( !empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross']) ) {
+				$paypal_payment_list = $wpdb->get_results($query);
+				if (!empty($paypal_payment_list)) {
+					foreach ($paypal_payment_list as $post) {
+						$order_meta = get_post_meta($post->post_id, '_order_postmeta', true);
+						$order_payment_meta = get_post_meta($post->post_id, 'wpshop_payment_return_data', true);
+						if (!empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount')) {
+							if (!empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross'])) {
 								$order_amount_to_pay = number_format($order_meta['order_grand_total'], 5);
 								$order_amount_payed = number_format(floatval($order_payment_meta['mc_gross']), 5);
-								if ($order_amount_payed == $order_amount_to_pay ) {
+								if ($order_amount_payed == $order_amount_to_pay) {
 									wpshop_payment::setOrderPaymentStatus($order_id, 'completed');
 								}
 							}
@@ -1273,17 +1273,17 @@ 
 				/**	Save existing orders address information	*/
 				$billing_title = __('Billing address', 'wpshop');
 				$shipping_title = __('Shipping address', 'wpshop');
-				$results = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1) );
-				foreach ( $results as $result ) {
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
 					$address = get_post_meta($result->ID, '_order_info', true);
 					$address_format = array();
 
 					$billing_address = array();
-					if ( !empty($address['billing']) && empty($address['billing']['id']) ) {
-						if ( !empty($address['billing']['civility']) ) {
-							switch ( $address['billing']['civility'] ) {
+					if (!empty($address['billing']) && empty($address['billing']['id'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1292,12 +1292,12 @@ 
 									$civility = $miss_id;
 									break;
 								default:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 							}
 						}
 						else {
-							$civility = $mister_id ;
+							$civility = $mister_id;
 						}
 						$billing_address = array('address_title' => $billing_title,
 							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
@@ -1313,17 +1313,17 @@ 
 							'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
 							'civility' => $civility
 						);
-						$billing_address_option = get_option( 'wpshop_billing_address' );
+						$billing_address_option = get_option('wpshop_billing_address');
 						$address_format['billing']['id'] = $billing_address_option['choice'];
 						$address_format['billing']['address'] = $shipping_address;
 					}
 
 					$shipping_address = array();
-					if ( !empty($address['shipping']) && empty($address['shipping']['id']) ) {
-						if ( !empty($address['shipping']['civility']) ) {
-							switch ( $address['shipping']['civility'] ) {
+					if (!empty($address['shipping']) && empty($address['shipping']['id'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
 								case 1:
-									$civility = $mister_id ;
+									$civility = $mister_id;
 									break;
 								case 2:
 									$civility = $madam_id;
@@ -1347,19 +1347,19 @@ 
 							'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
 							'civility' => $civility
 						);
-						$shipping_address_options = get_option( 'wpshop_shipping_address_choice' );
+						$shipping_address_options = get_option('wpshop_shipping_address_choice');
 						$address_format['shipping']['id'] = $shipping_address_options['choice'];
 						$address_format['shipping']['address'] = $shipping_address;
 					}
 
-					if ( !empty($address_format) ) {
+					if (!empty($address_format)) {
 						update_post_meta($result->ID, '_order_info', $address_format);
 					}
 				}
 
 				/**	Delete username from frontend form	*/
 				$attribute_login = wpshop_attributes::getElement('user_login', "'valid'", 'code');
-				if ( !empty($attribute_login) ) {
+				if (!empty($attribute_login)) {
 					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $attribute_login->id));
 				}
 
@@ -1370,9 +1370,9 @@ 
 
 			case '31':
 				/**	Change order structure in order to support several payment	*/
-				$existing_orders = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')) );
-				if ( !empty($existing_orders) ) {
-					foreach ( $existing_orders as $order_main_informations) {
+				$existing_orders = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')));
+				if (!empty($existing_orders)) {
+					foreach ($existing_orders as $order_main_informations) {
 						/**	Transfer payment return data form old meta to new	*/
 						$order_payment_return_data = get_post_meta($order_main_informations->ID, 'wpshop_payment_return_data', true);
 						update_post_meta($order_main_informations->ID, '_wpshop_payment_return_data', $order_payment_return_data);
@@ -1380,7 +1380,7 @@ 
 
 						/**	Transfer old payment storage method to new storage method	*/
 						$order_meta = get_post_meta($order_main_informations->ID, '_order_postmeta', true);
-						if ( !empty($order_meta['order_status']) ) {
+						if (!empty($order_meta['order_status'])) {
 							$order_meta['order_payment']['customer_choice'] = array('method' => (!empty($order_meta['payment_method']) ? $order_meta['payment_method'] : (!empty($order_meta['order_payment']['customer_choice']) ? $order_meta['order_payment']['customer_choice'] : '')));
 							unset($order_meta['payment_method']);
 							$order_meta['order_payment']['received'][0]['waited_amount'] = !empty($order_meta['order_grand_total']) ? $order_meta['order_grand_total'] : 0;
@@ -1389,9 +1389,9 @@ 
 							$order_meta['order_payment']['received'][0]['status'] = 'waiting_payment';
 							$order_meta['order_payment']['received'][0]['comment'] = '';
 							$order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
-							if ( in_array($order_meta['order_status'], array('completed', 'shipped')) ) {
+							if (in_array($order_meta['order_status'], array('completed', 'shipped'))) {
 								$order_meta['order_payment']['received'][0]['received_amount'] = $order_meta['order_grand_total'];
-								$order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way( $order_main_informations->ID );
+								$order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way($order_main_informations->ID);
 								$order_meta['order_payment']['received'][0]['date'] = $order_meta['order_payment_date'];
 								$order_meta['order_payment']['received'][0]['status'] = 'payment_received';
 								$order_meta['order_payment']['received'][0]['comment'] = '';
@@ -1421,43 +1421,43 @@ 
 				wp_reset_query();
 
 				$default_currency = get_option('wpshop_shop_default_currency');
-				foreach ( unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v ) {
-					if ( $default_currency == $k ) {
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
 						$symbol = $v;
 					}
 				}
-				if ( !empty($symbol) ) {
-					$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE name = "'.html_entity_decode($symbol, ENT_QUOTES, 'UTF-8').'"', '');
+				if (!empty($symbol)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"', '');
 					$currency = $wpdb->get_row($query);
-					if ( !empty($currency) ) {
+					if (!empty($currency)) {
 						update_option('wpshop_shop_default_currency', $currency->id);
 						// Update the change rate of the default currency
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id) );
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
 					}
 				}
 
 				$shipping_confirmation_message = get_option('WPSHOP_SHIPPING_CONFIRMATION_MESSAGE');
-				if ( !empty($shipping_confirmation_message) ) {
+				if (!empty($shipping_confirmation_message)) {
 					$message = __('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop');
 					$post = array('ID'=> $shipping_confirmation_message, 'post_content' => $message);
-					wp_update_post( $post );
+					wp_update_post($post);
 				}
 				return true;
 			break;
 			case '32':
 				/**	Update product set id that are null 	*/
-				$query = $wpdb->prepare( "UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id' );
+				$query = $wpdb->prepare("UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id');
 				$wpdb->query($query);
 
-				$addons_options = get_option( WPSHOP_ADDONS_OPTION_NAME );
-				if ( !empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate'] ) {
-					$admin_new_quotation_message = get_option( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
-					if ( empty($admin_new_quotation_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
+				$addons_options = get_option(WPSHOP_ADDONS_OPTION_NAME);
+				if (!empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) {
+					$admin_new_quotation_message = get_option('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
+					if (empty($admin_new_quotation_message)) {
+						wps_message_ctr::createMessage('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
 					}
-					$admin_new_quotation_confirm_message = get_option( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
-					if ( empty($admin_new_quotation_confirm_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
+					$admin_new_quotation_confirm_message = get_option('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
+					if (empty($admin_new_quotation_confirm_message)) {
+						wps_message_ctr::createMessage('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
 					}
 				}
 
@@ -1477,8 +1477,8 @@ 
 				/** Update VAT Rate*/
 				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'tx_tva', 'eco_taxe_rate_tva');
 				$attribute_ids = $wpdb->get_results($query);
-				foreach ( $attribute_ids as $attribute_id) {
-					$query = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
+				foreach ($attribute_ids as $attribute_id) {
+					$query = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
 					$wpdb->query($query);
 				}
 
@@ -1487,78 +1487,78 @@ 
 
 			case '33' :
 				/** Update the user_mail for the new system of log in/register */
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
 
 				/** Put discount attributes in price attribute set section*/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'prices');
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
 				$prices_section_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
 				$attributes = $wpdb->get_results($query);
-				if ( !empty($attributes) && !empty($prices_section_id) ) {
-					foreach ( $attributes as $attribute) {
-						$query = $wpdb->query('UPDATE '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' SET attribute_group_id = '. $prices_section_id .' WHERE attribute_id = '.$attribute->id);
+				if (!empty($attributes) && !empty($prices_section_id)) {
+					foreach ($attributes as $attribute) {
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' SET attribute_group_id = ' . $prices_section_id . ' WHERE attribute_id = ' . $attribute->id);
 					}
 				}
 				return true;
 			break;
 
 			case '34' :
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'prices');
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
 				$prices_section_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' WHERE attribute_group_id = %d', $prices_section_id);
+				$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_group_id = %d', $prices_section_id);
 				$last_position_id = $wpdb->get_var($query);
 
-				$query = $wpdb->prepare('SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_DETAILS.' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
 				$attribute_example = $wpdb->get_row($query);
 
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
 				$attributes = $wpdb->get_results($query);
 				$i = 1;
-				if ( !empty($attributes) && !empty($prices_section_id) ) {
+				if (!empty($attributes) && !empty($prices_section_id)) {
 
-					foreach ( $attributes as $attribute) {
-						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id) );
+					foreach ($attributes as $attribute) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id));
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_example->entity_type_id, 'attribute_set_id' => $attribute_example->attribute_set_id, 'attribute_group_id' => $prices_section_id, 'attribute_id' => $attribute->id, 'position' => $last_position_id + $i));
 						$i++;
 					}
 				}
 				$discount_options = get_option('wpshop_catalog_product_option');
-				$status =  ( !empty($discount_options) && !empty($discount_options['discount']) ) ? 'valid' : 'notused';
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status ), array('code' => 'special_from') );
-				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status ), array('code' => 'special_to') );
+				$status = (!empty($discount_options) && !empty($discount_options['discount'])) ? 'valid' : 'notused';
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status), array('code' => 'special_from'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status), array('code' => 'special_to'));
 				return true;
 			break;
 
 
 			case '35' :
-				$wpdb->update( $wpdb->posts, array('post_status'=>'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) );
+				$wpdb->update($wpdb->posts, array('post_status'=>'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS));
 				return true;
 			break;
 
 			case '36' :
 				wpshop_entities::create_cpt_attributes_from_csv_file(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
-				@set_time_limit( 900 );
+				@set_time_limit(900);
 				/** Change the path for old categories pictures */
-				@chmod(WPSHOP_UPLOAD_DIR .'wpshop_product_category', 0755);
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category', 0755);
 
-				$query = 'SELECT * FROM ' .$wpdb->terms;
+				$query = 'SELECT * FROM ' . $wpdb->terms;
 				$terms = $wpdb->get_results($query);
-				if ( !empty($terms) ) {
-					foreach ( $terms as $term ) {
-						@chmod(WPSHOP_UPLOAD_DIR .'wpshop_product_category/'.$term->term_id, 0755);
+				if (!empty($terms)) {
+					foreach ($terms as $term) {
+						@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category/' . $term->term_id, 0755);
 						/** Check if a picture exists **/
-						$term_option =  get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$term->term_id );
-						if ( !empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture']) ) {
+						$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id);
+						if (!empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'])) {
 							$wp_upload_dir = wp_upload_dir();
 							$img_path = WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'];
 							$img_basename = basename($img_path);
-							$wp_filetype = wp_check_filetype($img_basename, null );
+							$wp_filetype = wp_check_filetype($img_basename, null);
 							/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-							$rand_name = ( is_file($wp_upload_dir['path'] . '/' .$img_basename) ) ? rand() : '';
-							$img_basename = ( !empty($rand_name) ) ? $rand_name.'_'.$img_basename : $img_basename;
-							if ( copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename) ) {
+							$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+							$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
+							if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
 								$attachment = array(
 										'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
 										'post_mime_type' => $wp_filetype['type'],
@@ -1566,14 +1566,14 @@ 
 										'post_content' => '',
 										'post_status' => 'inherit'
 								);
-								$attach_id = wp_insert_attachment( $attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+								$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
 								/** Generate differnts sizes for this image **/
 								require_once(ABSPATH . 'wp-admin/includes/image.php');
-								$attach_data = wp_generate_attachment_metadata( $attach_id, $wp_upload_dir['path'] . '/' . $img_basename );
-								wp_update_attachment_metadata( $attach_id, $attach_data );
+								$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+								wp_update_attachment_metadata($attach_id, $attach_data);
 								/** Update option picture **/
 								$term_option['wpshop_category_picture'] = $attach_id;
-								update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$term->term_id , $term_option);
+								update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id, $term_option);
 							}
 						}
 					}
@@ -1581,16 +1581,16 @@ 
 
 
 				/** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox **/
-				$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->usermeta. ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
-				$meta_keys = $wpdb->get_results( $query );
-				if ( !empty($meta_keys) && is_array( $meta_keys) ) {
-					foreach ( $meta_keys as $meta_key ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->usermeta . ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
+				$meta_keys = $wpdb->get_results($query);
+				if (!empty($meta_keys) && is_array($meta_keys)) {
+					foreach ($meta_keys as $meta_key) {
 						$user_id = $meta_key->user_id;
 						$meta_value = unserialize($meta_key->meta_value);
-						if ( !empty( $meta_value) && is_array($meta_value) ) {
+						if (!empty($meta_value) && is_array($meta_value)) {
 							$data_to_delete = array_search('add-wpshop_product_category', $meta_value);
-							if ( $data_to_delete !== false ) {
-								unset( $meta_value[$data_to_delete] );
+							if ($data_to_delete !== false) {
+								unset($meta_value[$data_to_delete]);
 							}
 						}
 						update_user_meta($user_id, 'metaboxhidden_nav-menus', $meta_value);
@@ -1600,39 +1600,39 @@ 
 			break;
 
 			case '37' :
-				@set_time_limit( 900 );
+				@set_time_limit(900);
 				/** Change the path for old categories pictures */
-				@chmod(WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category', 0755);
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category', 0755);
 				/** Read all categories folders **/
-				$categories_main_dir = WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category';
-				if ( file_exists($categories_main_dir) ) {
+				$categories_main_dir = WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category';
+				if (file_exists($categories_main_dir)) {
 					$main_folder_content = scandir($categories_main_dir);
 					/** For each category folder **/
-					foreach ( $main_folder_content as $category_folder ) {
-						if ( $category_folder && substr( $category_folder, 0, 1) != '.' ) {
+					foreach ($main_folder_content as $category_folder) {
+						if ($category_folder && substr($category_folder, 0, 1) != '.') {
 							$category_id = $category_folder;
-							@chmod(WPSHOP_UPLOAD_DIR .'wpshop/wpshop_product_category/'.$category_id, 0755);
-							$scan_category_folder = opendir($categories_main_dir.'/'.$category_folder);
+							@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category/' . $category_id, 0755);
+							$scan_category_folder = opendir($categories_main_dir . '/' . $category_folder);
 							/** For each Picture of category **/
 							$file_time = 0;
 							$save_this_picture = false;
-							while(false !== ($fichier = readdir($scan_category_folder))) {
-								if ( $fichier && substr( $fichier, 0, 1) != '.' ) {
-									if ( $file_time < filemtime($categories_main_dir . '/'. $category_id . '/'. $fichier) ) {
+							while (false !== ($fichier = readdir($scan_category_folder))) {
+								if ($fichier && substr($fichier, 0, 1) != '.') {
+									if ($file_time < filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier)) {
 										$save_this_picture = true;
-										$file_time = filemtime($categories_main_dir . '/'. $category_id . '/'. $fichier);
+										$file_time = filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier);
 									}
 									/** Select category option **/
-									$term_option =  get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$category_id );
+									$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 									$wp_upload_dir = wp_upload_dir();
-									$img_path = $categories_main_dir . '/' . $category_id .'/'. $fichier;
+									$img_path = $categories_main_dir . '/' . $category_id . '/' . $fichier;
 									$img_basename = basename($img_path);
-									$wp_filetype = wp_check_filetype($img_basename, null );
+									$wp_filetype = wp_check_filetype($img_basename, null);
 									/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-									$rand_name = ( is_file($wp_upload_dir['path'] . '/' .$img_basename) ) ? rand() : '';
-									$img_basename = ( !empty($rand_name) ) ? $rand_name.'_'.$img_basename : $img_basename;
+									$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+									$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
 
-									if ( copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename) ) {
+									if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
 										$attachment = array(
 												'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
 												'post_mime_type' => $wp_filetype['type'],
@@ -1640,15 +1640,15 @@ 
 												'post_content' => '',
 												'post_status' => 'inherit'
 										);
-										$attach_id = wp_insert_attachment( $attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+										$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
 										/** Generate differnts sizes for this image **/
 										require_once(ABSPATH . 'wp-admin/includes/image.php');
-										$attach_data = wp_generate_attachment_metadata( $attach_id, $wp_upload_dir['path'] . '/' . $img_basename );
-										wp_update_attachment_metadata( $attach_id, $attach_data );
+										$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+										wp_update_attachment_metadata($attach_id, $attach_data);
 										/** Update option picture **/
-										$term_option['wpshop_category_picture'] =  $attach_id;
-										if ( $save_this_picture ) {
-											update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' .$category_id , $term_option);
+										$term_option['wpshop_category_picture'] = $attach_id;
+										if ($save_this_picture) {
+											update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $term_option);
 										}
 										$save_this_picture = false;
 									}
@@ -1661,33 +1661,33 @@ 
 				break;
 
 			case '38' :
-				wps_message_ctr::createMessage( 'WPSHOP_QUOTATION_UPDATE_MESSAGE' );
+				wps_message_ctr::createMessage('WPSHOP_QUOTATION_UPDATE_MESSAGE');
 				return true;
 			break;
 
 			case '39' :
 				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
 				/** Check if the 7% VAT Rate is not already created **/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND value = %s',  $attribute_def->id, '7');
-				$exist_vat_rate = $wpdb->get_results( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '7');
+				$exist_vat_rate = $wpdb->get_results($query);
 
-				if ( empty($exist_vat_rate) ) {
+				if (empty($exist_vat_rate)) {
 					/** Get Max Position **/
-					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $attribute_def->id);
-					$max_position = $wpdb->get_var( $query );
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
 
-					if ( !empty( $attribute_def) && !empty($attribute_def->id)  ) {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '7', 'label' => '7') );
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '7', 'label' => '7'));
 					}
 				}
 
 				/** Filter Search optimization **/
-				@set_time_limit( 900 );
-				$query = $wpdb->prepare('SELECT term_id FROM '.$wpdb->term_taxonomy.' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-				$categories = $wpdb->get_results( $query );
+				@set_time_limit(900);
+				$query = $wpdb->prepare('SELECT term_id FROM ' . $wpdb->term_taxonomy . ' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				$categories = $wpdb->get_results($query);
 				$cats = array();
-				if ( !empty($categories) ) {
-					foreach($categories as $category) {
+				if (!empty($categories)) {
+					foreach ($categories as $category) {
 						$cats[] = $category->term_id;
 					}
 					$wpshop_filter_search = new wps_filter_search();
@@ -1699,116 +1699,116 @@ 
 			case '40' :
 				/**	Store watt in puissance unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('puissance', 'wpshop'));
-				$puissance_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt') );
+				$puissance_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt'));
 
 				/**	Store day/week/year in duration unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('duration', 'wpshop'));
-				$duration_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day') );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week') );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year') );
+				$duration_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year'));
 
 				/**	Store day/week/year in duration unit group	*/
 				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('length', 'wpshop'));
-				$length_unit_group_id = $wpdb->get_var( $query );
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm') );
+				$length_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm'));
 				return true;
 			break;
 
 			case '41':
 				/**	Get distinct attribute set and delete doublons	*/
 				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " GROUP BY name HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET);
 
 				/**	Get and delete attribute set section	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " )";
-				$wpdb->query( $query );
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP );
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP);
 
 				/**	Get and delete attribute set details	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-				$wpdb->query( $query );
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				$query = "SELECT attribute_set_id, attribute_group_id, attribute_id, MIN(id) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-				$affectation_list = $wpdb->get_results( $query );
-				foreach ( $affectation_list as $affectation_to_treat ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id );
-					$wpdb->query( $query );
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $affectation_to_treat) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				/**	Get and delete double unit	*/
 				$query = "SELECT DISTINCT( unit ) AS unit, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " GROUP BY unit HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT);
 
 				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " GROUP BY name HAVING COUNT(id) > 1";
-				$list_of_set = $wpdb->get_results( $query );
-				foreach ( $list_of_set as $set_infos ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id );
-					$wpdb->query( $query );
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 
 				/**	Get and delete attribute set details	*/
 				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-				$wpdb->query( $query );
+				$wpdb->query($query);
 				$query = "SELECT GROUP_CONCAT( id ) AS list_id, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-				$affectation_list = $wpdb->get_results( $query );
-				foreach ( $affectation_list as $list ) {
-					$query = $wpdb->prepare( "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . ( substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id ) . ") AND id != %d", $list->min_id , '');
-					$wpdb->query( $query );
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $list) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . (substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id) . ") AND id != %d", $list->min_id, '');
+					$wpdb->query($query);
 				}
-				$wpdb->query( "OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS );
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
 
 				return true;
 			break;
 
 			case '42' :
-				$available_downloadable_product = get_option( 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' );
-				if ( empty($available_downloadable_product) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' );
+				$available_downloadable_product = get_option('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
 				}
 				return true;
 			break;
 
 			case '43' :
-				$available_downloadable_product = get_option( 'WPSHOP_ORDER_IS_CANCELED' );
-				if ( empty($available_downloadable_product) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_ORDER_IS_CANCELED' );
+				$available_downloadable_product = get_option('WPSHOP_ORDER_IS_CANCELED');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_ORDER_IS_CANCELED');
 				}
 				return true;
 			break;
 
 			case '44' :
 				$display_option = get_option('wpshop_display_option');
-				if ( !empty($display_option) && empty($display_option['latest_products_ordered']) ) {
+				if (!empty($display_option) && empty($display_option['latest_products_ordered'])) {
 					$display_option['latest_products_ordered'] = 3;
 					update_option('wpshop_display_option', $display_option);
 				}
 
 				/** Check messages for customization **/
-				$messages = array( 'WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
-				if ( !empty( $messages) ) {
-					foreach ($messages as $key => $message ) {
-						$message_option = get_option( $key );
-						if ( !empty( $message_option) ) {
-							$post_message =  get_post( $message_option );
-							$original_message = ( !empty($post_message) && !empty($post_message->post_content) ) ? $post_message->post_content : '';
+				$messages = array('WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
+				if (!empty($messages)) {
+					foreach ($messages as $key => $message) {
+						$message_option = get_option($key);
+						if (!empty($message_option)) {
+							$post_message = get_post($message_option);
+							$original_message = (!empty($post_message) && !empty($post_message->post_content)) ? $post_message->post_content : '';
 							$tags = array('<p>', '</p>');
-							if ( str_replace( $tags, '', $original_message) == str_replace( $tags, '', __( $message, 'wpshop' ) ) ) {
-								wp_update_post( array( 'ID' => $message_option, 'post_content' => wps_message_ctr::customize_message($original_message) ) );
+							if (str_replace($tags, '', $original_message) == str_replace($tags, '', __($message, 'wpshop'))) {
+								wp_update_post(array('ID' => $message_option, 'post_content' => wps_message_ctr::customize_message($original_message)));
 							}
 						}
 					}
@@ -1824,8 +1824,8 @@ 
 			break;
 
 			case '46':
-				wps_message_ctr::createMessage( 'WPSHOP_FORGOT_PASSWORD_MESSAGE' );
-				wps_message_ctr::customize_message( WPSHOP_FORGOT_PASSWORD_MESSAGE );
+				wps_message_ctr::createMessage('WPSHOP_FORGOT_PASSWORD_MESSAGE');
+				wps_message_ctr::customize_message(WPSHOP_FORGOT_PASSWORD_MESSAGE);
 				return true;
 			break;
 
@@ -1838,17 +1838,17 @@ 
 				@ini_set('max_execution_time', '500');
 
 				$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-				$output_type_option = get_option( 'wpshop_display_option' );
+				$output_type_option = get_option('wpshop_display_option');
 				$output_type = $output_type_option['wpshop_display_list_type'];
 
-				for( $i = 0; $i <= $count_products->publish; $i+= 20 ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-					$products = $wpdb->get_results( $query );
-					if ( !empty($products) ) {
-						foreach( $products as $product ) {
+				for ($i = 0; $i <= $count_products->publish; $i += 20) {
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+					$products = $wpdb->get_results($query);
+					if (!empty($products)) {
+						foreach ($products as $product) {
 							$p = wpshop_products::get_product_data($product->ID);
-							$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type) );
-							update_post_meta(  $product->ID, '_wps_price_infos', $price );
+							$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+							update_post_meta($product->ID, '_wps_price_infos', $price);
 						}
 					}
 				}
@@ -1857,15 +1857,15 @@ 
 			break;
 
 			case '49' :
-				update_option( 'wpshop_send_invoice', true);
+				update_option('wpshop_send_invoice', true);
 				return true;
 			break;
 
 			case '50' :
-				$price_display_option = get_option( 'wpshop_catalog_product_option' );
+				$price_display_option = get_option('wpshop_catalog_product_option');
 				$price_display_option['price_display']['text_from'] = 'on';
 				$price_display_option['price_display']['lower_price'] = 'on';
-				update_option( 'wpshop_catalog_product_option', $price_display_option );
+				update_option('wpshop_catalog_product_option', $price_display_option);
 
  				self::wpshop_insert_default_pages();
 
@@ -1874,45 +1874,45 @@ 
 
 			case '51' :
 				/**	Insert new message for direct payment link	*/
-				$direct_payment_link_message = get_option( 'WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE' );
-				if ( empty($direct_payment_link_message) ) {
-					wps_message_ctr::createMessage( 'WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE' );
+				$direct_payment_link_message = get_option('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
+				if (empty($direct_payment_link_message)) {
+					wps_message_ctr::createMessage('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
 				}
 				return true;
 			break;
 
 			case '52' :
-				$account_page_option = get_option( 'wpshop_myaccount_page_id' );
-				if( !empty($account_page_option) ) {
-					$page_account = get_post( $account_page_option );
-					$page_content = ( !empty($page_account) && !empty($page_account->post_content) ) ? str_replace( '[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content ) : '[wps_account_dashboard]';
-					wp_update_post( array('ID' => $account_page_option, 'post_content' => $page_content ) );
+				$account_page_option = get_option('wpshop_myaccount_page_id');
+				if (!empty($account_page_option)) {
+					$page_account = get_post($account_page_option);
+					$page_content = (!empty($page_account) && !empty($page_account->post_content)) ? str_replace('[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $account_page_option, 'post_content' => $page_content));
 				}
 				return true;
 			break;
 
 			case '53' :
-				$payment_modes_option = get_option( 'wps_payment_mode' );
-				if( !empty($payment_modes_option) && !empty($payment_modes_option['mode']) ) {
+				$payment_modes_option = get_option('wps_payment_mode');
+				if (!empty($payment_modes_option) && !empty($payment_modes_option['mode'])) {
 					$payment_modes_option['mode']['cash_on_delivery'] = array(
-							'name' => __( 'Cash on delivery', 'wpshop'),
-							'logo' => WPSHOP_TEMPLATES_URL.'wpshop/cheque.png',
-							'description' => __( 'Pay your order on delivery', 'wpshop') );
+							'name' => __('Cash on delivery', 'wpshop'),
+							'logo' => WPSHOP_TEMPLATES_URL . 'wpshop/cheque.png',
+							'description' => __('Pay your order on delivery', 'wpshop') );
 
-					update_option( 'wps_payment_mode' ,$payment_modes_option );
+					update_option('wps_payment_mode', $payment_modes_option);
 				}
 
 				// Mass action on products to add a flag on variation definition
-				$products = get_posts( array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) );
-				if( !empty($products) ) {
-					foreach( $products as $p ) {
+				$products = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+				if (!empty($products)) {
+					foreach ($products as $p) {
 						$post_id = $p->ID;
-						$check_product_have_variations = wpshop_products::get_variation( $post_id );
-						if( !empty($check_product_have_variations) ) {
-							$variation_flag =  wpshop_products::check_variation_type( $post_id );
-							$variation_defining = get_post_meta( $post_id, '_wpshop_variation_defining', true );
+						$check_product_have_variations = wpshop_products::get_variation($post_id);
+						if (!empty($check_product_have_variations)) {
+							$variation_flag = wpshop_products::check_variation_type($post_id);
+							$variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
 							$variation_defining['variation_type'] = $variation_flag;
-							update_post_meta( $post_id, '_wpshop_variation_defining', $variation_defining );
+							update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
 						}
 					}
 				}
@@ -1921,28 +1921,28 @@ 
 
 			case '54' :
 				// Change shortcode of sign up page
-				$signup_page_id = get_option( 'wpshop_signup_page_id' );
-				if( !empty($signup_page_id) ) {
-					$signup_page = get_post( $signup_page_id );
-					$signup_page_content = ( !empty($signup_page) && !empty($signup_page->post_content) ) ? str_replace( '[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content ) : '[wps_account_dashboard]';
-					wp_update_post( array('ID' => $signup_page_id, 'post_content' => $signup_page_content ) );
+				$signup_page_id = get_option('wpshop_signup_page_id');
+				if (!empty($signup_page_id)) {
+					$signup_page = get_post($signup_page_id);
+					$signup_page_content = (!empty($signup_page) && !empty($signup_page->post_content)) ? str_replace('[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $signup_page_id, 'post_content' => $signup_page_content));
 				}
 
 				// Change Terms of sale default content
-				$terms_page_id = get_option( 'wpshop_terms_of_sale_page_id' );
-				if( !empty($terms_page_id) ) {
-					$terms_sale_page = get_post( $terms_page_id );
-					if( !empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]' ) {
-						$data  = '<h1>'.__( 'Your terms of sale', 'wpshop' ).'</h1>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 1</h3>';
+				$terms_page_id = get_option('wpshop_terms_of_sale_page_id');
+				if (!empty($terms_page_id)) {
+					$terms_sale_page = get_post($terms_page_id);
+					if (!empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]') {
+						$data  = '<h1>' . __('Your terms of sale', 'wpshop') . '</h1>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 1</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 2</h3>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 2</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Rule', 'wpshop' ).' 3</h3>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 3</h3>';
 						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-						$data .= '<h3>'.__( 'Credits', 'wpshop' ).'</h3>';
-						$data .= sprintf( __( '%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name') );
-						wp_update_post( array('ID' => $terms_page_id, 'post_content' => $data ) );
+						$data .= '<h3>' . __('Credits', 'wpshop') . '</h3>';
+						$data .= sprintf(__('%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name'));
+						wp_update_post(array('ID' => $terms_page_id, 'post_content' => $data));
 					}
 				}
 
@@ -1951,58 +1951,58 @@ 
 
 
 			case '55' :
-				$checkout_page_id = get_option( 'wpshop_checkout_page_id' );
-				$checkout_page = get_post( $checkout_page_id );
-				$checkout_page_content = ( !empty($checkout_page) && !empty($checkout_page->post_content) ) ? str_replace( '[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content ) : '[wps_checkout]';
-				wp_update_post( array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content ) );
+				$checkout_page_id = get_option('wpshop_checkout_page_id');
+				$checkout_page = get_post($checkout_page_id);
+				$checkout_page_content = (!empty($checkout_page) && !empty($checkout_page->post_content)) ? str_replace('[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content) : '[wps_checkout]';
+				wp_update_post(array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content));
 
 				// Update cart page id
-				update_option( 'wpshop_cart_page_id', $checkout_page_id );
+				update_option('wpshop_cart_page_id', $checkout_page_id);
 				return true;
 			break;
 
 
 			case '56' :
 				$wps_entities = new wpshop_entities();
-				$customer_entity_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id );
-				$set = $wpdb->get_row( $query );
-				if( !empty($set) ) {
-					$wpdb->update( WPSHOP_DBT_ATTRIBUTE_SET,
-							array( 'default_set' => 'yes' ),
-							array( 'id' => $set->id) );
+				$customer_entity_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id);
+				$set = $wpdb->get_row($query);
+				if (!empty($set)) {
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET,
+							array('default_set' => 'yes'),
+							array('id' => $set->id));
 				}
 				// Update Opinions activation option
-				update_option( 'wps_opinion', array( 'active' => 'on') );
+				update_option('wps_opinion', array('active' => 'on'));
 				return true;
 			break;
 
 			case '57' :
-				$wpshop_cart_option = get_option( 'wpshop_cart_option' );
+				$wpshop_cart_option = get_option('wpshop_cart_option');
 				$wpshop_cart_option['display_newsletter']['site_subscription'][] = 'yes';
 				$wpshop_cart_option['display_newsletter']['partner_subscription'][] = 'yes';
 
-				update_option( 'wpshop_cart_option', $wpshop_cart_option );
+				update_option('wpshop_cart_option', $wpshop_cart_option);
 				return true;
 			break;
 
 			case '58' :
 				/** Turn customers publish into draft **/
-				$query = $wpdb->prepare( "UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$wpdb->query( $query );
+				$query = $wpdb->prepare("UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$wpdb->query($query);
 
 				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
 				/** Check if the 0% VAT Rate is not already created **/
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND value = %s',  $attribute_def->id, '0');
-				$exist_vat_rate = $wpdb->get_results( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '0');
+				$exist_vat_rate = $wpdb->get_results($query);
 
-				if ( empty($exist_vat_rate) ) {
+				if (empty($exist_vat_rate)) {
 					/** Get Max Position **/
-					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $attribute_def->id);
-					$max_position = $wpdb->get_var( $query );
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
 
-					if ( !empty( $attribute_def) && !empty($attribute_def->id)  ) {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '0', 'label' => '0') );
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' =>  $attribute_def->id, 'position' => (int)$max_position + 1, 'value' => '0', 'label' => '0'));
 					}
 				}
 				return true;
@@ -2014,31 +2014,31 @@ 
 				$args = array(
 						'posts_per_page'   => -1,
 						'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-						'post_status'	   => array( 'publish', 'draft', 'trash' ),
+						'post_status'	   => array('publish', 'draft', 'trash'),
 				);
-				$posts = get_posts( $args );
+				$posts = get_posts($args);
 				$result = array();
-				foreach( $posts as $post ) {
+				foreach ($posts as $post) {
 					$array = array();
 					$array['Post'] = $post;
-					$array['PrincipalThumbnailID'] = get_post_meta( $post->ID, '_thumbnail_id', true);
-					$array['Attachments'] = get_attached_media( $allowed, $post->ID );
-					$array['TrueAttachmentsString'] = get_post_meta( $post->ID, '_wps_product_media', true );
-					if( !empty( $array['TrueAttachmentsString'] ) ) {
-						$TrueAttachments_id = explode( ',', $array['TrueAttachmentsString'] );
+					$array['PrincipalThumbnailID'] = get_post_meta($post->ID, '_thumbnail_id', true);
+					$array['Attachments'] = get_attached_media($allowed, $post->ID);
+					$array['TrueAttachmentsString'] = get_post_meta($post->ID, '_wps_product_media', true);
+					if (!empty($array['TrueAttachmentsString'])) {
+						$TrueAttachments_id = explode(',', $array['TrueAttachmentsString']);
 					}
 					$array['OldAttachmentsString'] = '';
-					foreach( $array['Attachments'] as $attachment ) {
-						$filename =  basename( get_attached_file( $attachment->ID ) );
-						$pos_ext = strrpos( $filename, '.' );
-						$filename_no_ext = substr( $filename, 0, $pos_ext );
-						if( ( empty($TrueAttachments_id) || !in_array( $attachment->ID, $TrueAttachments_id ) ) && !( preg_match('#'.$filename_no_ext.'#', $post->post_content) ) && ( ( empty( $array['PrincipalThumbnailID'] ) || $attachment->ID != $array['PrincipalThumbnailID'] ) ) ) {
+					foreach ($array['Attachments'] as $attachment) {
+						$filename = basename(get_attached_file($attachment->ID));
+						$pos_ext = strrpos($filename, '.');
+						$filename_no_ext = substr($filename, 0, $pos_ext);
+						if ((empty($TrueAttachments_id) || !in_array($attachment->ID, $TrueAttachments_id)) && !(preg_match('#' . $filename_no_ext . '#', $post->post_content)) && ((empty($array['PrincipalThumbnailID']) || $attachment->ID != $array['PrincipalThumbnailID']))) {
 							$array['OldAttachmentsString'] .= $attachment->ID . ',';
 						}
 					}
 					unset($TrueAttachments_id);
 					$result[$post->ID] = $array['TrueAttachmentsString'] . $array['OldAttachmentsString'];
-					update_post_meta( $post->ID, '_wps_product_media', $result[$post->ID] );
+					update_post_meta($post->ID, '_wps_product_media', $result[$post->ID]);
 				}
 				return true;
 			break;
@@ -2048,26 +2048,26 @@ 
 				wps_message_ctr::create_default_message();
 
 				/** Update entries for quick add */
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
-				$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
-				switch( WPSHOP_PRODUCT_PRICE_PILOT ) {
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
+				switch (WPSHOP_PRODUCT_PRICE_PILOT) {
 					case 'HT':
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
 						break;
 					default:
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
-						$query = $wpdb->query('UPDATE ' .WPSHOP_DBT_ATTRIBUTE.' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
 						break;
 				}
 
 				/* Default country with WP language */
 				$wpshop_country_default_choice_option = get_option('wpshop_country_default_choice');
-				if ( empty($wpshop_country_default_choice_option) ) {
-					update_option( 'wpshop_country_default_choice', substr( get_bloginfo( 'language' ), 3) );
+				if (empty($wpshop_country_default_choice_option)) {
+					update_option('wpshop_country_default_choice', substr(get_bloginfo('language'), 3));
 				}
 				return true;
 			break;
@@ -2078,9 +2078,9 @@ 
 
  				/* Hide admin bar */
  				$wpshop_display_option = get_option('wpshop_display_option');
- 				if( !empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar']) ) {
+ 				if (!empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar'])) {
  					$wpshop_display_option['wpshop_hide_admin_bar'] = 'on';
- 					update_option( 'wpshop_display_option', $wpshop_display_option );
+ 					update_option('wpshop_display_option', $wpshop_display_option);
  				}
 
 				return true;
@@ -2094,30 +2094,30 @@ 
 			break;
 
 			case '63':
-				$data = get_option( 'wps_shipping_mode' );
-				if ( empty($data['modes']['default_shipping_mode_for_pos']) ) {
+				$data = get_option('wps_shipping_mode');
+				if (empty($data['modes']['default_shipping_mode_for_pos'])) {
 					$data['modes']['default_shipping_mode_for_pos']['name'] = __('No Delivery', 'wpshop');
 					$data['modes']['default_shipping_mode_for_pos']['explanation'] = __('Delivery method for point of sale.', 'wpshop');
-					update_option( 'wps_shipping_mode', $data );
+					update_option('wps_shipping_mode', $data);
 				}
 				return true;
 			break;
 
 			case '64':
-				$options = get_option( 'wpshop_catalog_product_option' );
-				if ( !empty( $options['wpshop_catalog_product_slug_with_category'] ) ) {
-					unset( $options['wpshop_catalog_product_slug_with_category'] );
-					update_option( 'wpshop_catalog_product_option', $options );
+				$options = get_option('wpshop_catalog_product_option');
+				if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
+					unset($options['wpshop_catalog_product_slug_with_category']);
+					update_option('wpshop_catalog_product_option', $options);
 				}
 				return true;
 			break;
 			
 			case '65':
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id );
-				$company_id = $wpdb->get_var( $query );
-				if( !isset( $company_id ) ) {
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE, array(
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id);
+				$company_id = $wpdb->get_var($query);
+				if (!isset($company_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
 						'is_visible_in_front' => 'no',
 						'is_visible_in_front_listing' => 'yes',
 						'is_global' => 'no',
@@ -2160,14 +2160,14 @@ 
 						'backend_css_class' => NULL,
 						'frontend_help_message' => NULL,
 						'entity_id' => $entity_id
-					) );
+					));
 					$company_id = $wpdb->insert_id;
 				}
 				
-				$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id );
-				$is_provider_id = $wpdb->get_var( $query );
-				if( !isset( $is_provider_id ) ) {
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE, array(
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id);
+				$is_provider_id = $wpdb->get_var($query);
+				if (!isset($is_provider_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
 						'is_visible_in_front' => 'no',
 						'is_visible_in_front_listing' => 'yes',
 						'is_global' => 'no',
@@ -2210,80 +2210,80 @@ 
 						'backend_css_class' => NULL,
 						'frontend_help_message' => NULL,
 						'entity_id' => $entity_id
-					) );
+					));
 					$is_provider_id = $wpdb->insert_id;
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
 						'status'				=> 'valid',
 						'attribute_id' 			=> $is_provider_id,
 						'creation_date_value' 	=> current_time('mysql'),
 						'value' 				=> 'yes',
 						'label' 				=> 'Yes',
-					) );
-					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					));
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
 						'status'				=> 'valid',
 						'attribute_id' 			=> $is_provider_id,
 						'creation_date_value' 	=> current_time('mysql'),
 						'value' 				=> 'no',
 						'label' 				=> 'No',
-					) );
+					));
 					$default_value = $wpdb->insert_id;
-					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array( 'default_value' => $default_value ), array( 'id' => $is_provider_id ) );
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('default_value' => $default_value), array('id' => $is_provider_id));
 				}
 				
-				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id);
 				$company_section_detail_id = $wpdb->get_var($query);
 				
-				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id);
 				$is_provider_section_detail_id = $wpdb->get_var($query);
 				
-				if( !isset( $is_provider_section_detail_id ) || !isset( $company_section_detail_id ) ) {
-					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id );
+				if (!isset($is_provider_section_detail_id) || !isset($company_section_detail_id)) {
+					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 					$attribute_set_id = $wpdb->get_var($query);
 					
 					$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, 'account');
 					$attribute_set_section_id = $wpdb->get_var($query);
 					
-					$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id );
-					$attributes_set_details = $wpdb->get_results( $query );
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id);
+					$attributes_set_details = $wpdb->get_results($query);
 					$set_details_id_postion_order = array();
-					foreach( $attributes_set_details as $attribute_set_detail ) {
-						$query = $wpdb->prepare( 'SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id );
-						$attribute_set_detail_code = $wpdb->get_var( $query );
-						if( $attribute_set_detail_code == 'last_name' ) {
+					foreach ($attributes_set_details as $attribute_set_detail) {
+						$query = $wpdb->prepare('SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id);
+						$attribute_set_detail_code = $wpdb->get_var($query);
+						if ($attribute_set_detail_code == 'last_name') {
 							$set_details_id_postion_order[1] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'first_name' ) {
+						if ($attribute_set_detail_code == 'first_name') {
 							$set_details_id_postion_order[2] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'user_email' ) {
+						if ($attribute_set_detail_code == 'user_email') {
 							$set_details_id_postion_order[3] = $attribute_set_detail->attribute_id;
 						}
-						if( $attribute_set_detail_code == 'user_pass' ) {
+						if ($attribute_set_detail_code == 'user_pass') {
 							$set_details_id_postion_order[4] = $attribute_set_detail->attribute_id;
 						}
 					}
-					$max_position = count( $set_details_id_postion_order );
+					$max_position = count($set_details_id_postion_order);
 					
-					if( !isset( $company_section_detail_id ) ) {
+					if (!isset($company_section_detail_id)) {
 						$max_position = $max_position + 1;
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int)$max_position ) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int)$max_position));
 						$set_details_id_postion_order[$max_position] = $company_id;
 						$company_section_detail_id = $wpdb->insert_id;
 					}
 					
-					if( !isset( $is_provider_section_detail_id ) ) {
+					if (!isset($is_provider_section_detail_id)) {
 						$max_position = $max_position + 1;
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int)$max_position ) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int)$max_position));
 						$set_details_id_postion_order[$max_position] = $is_provider_id;
 						$is_provider_section_detail_id = $wpdb->insert_id;
 					}
 					
-					foreach( $set_details_id_postion_order as $pos => $attr_id ) {
-						$wpdb->update( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'position' => $pos ), array( 'attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id ), array( '%d' ), array( '%d', '%d', '%d', '%d' ) );
+					foreach ($set_details_id_postion_order as $pos => $attr_id) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('position' => $pos), array('attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id), array('%d'), array('%d', '%d', '%d', '%d'));
 					}
 				}
 				
-				$wpdb->update( WPSHOP_DBT_ATTRIBUTE_SET, array( 'name' => __( 'Free product', 'wpshop' ), 'slug' => 'free_product' ), array( 'name' => 'free_product' ), array( '%s', '%s' ), array( '%s' ) );
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('name' => __('Free product', 'wpshop'), 'slug' => 'free_product'), array('name' => 'free_product'), array('%s', '%s'), array('%s'));
 				
 				return true;
 			break;
@@ -2307,23 +2307,23 @@ 
 	 * Method called when deactivating the plugin
 	 * @see register_deactivation_hook()
 	 */
-	function uninstall_wpshop(){
+	function uninstall_wpshop() {
 		global $wpdb;
 
-		if(WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION && in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))){
+		if (WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION && in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
 			$query = $wpdb->query("DROP TABLE `wp_wpshop__attribute`, `wp_wpshop__attributes_unit`, `wp_wpshop__attributes_unit_groups`, `wp_wpshop__attribute_set`, `wp_wpshop__attribute_set_section`, `wp_wpshop__attribute_set_section_details`, `wp_wpshop__attribute_value_datetime`, `wp_wpshop__attribute_value_decimal`, `wp_wpshop__attribute_value_integer`, `wp_wpshop__attribute_value_text`, `wp_wpshop__attribute_value_varchar`, `wp_wpshop__attribute_value__histo`, `wp_wpshop__cart`, `wp_wpshop__cart_contents`, `wp_wpshop__documentation`, `wp_wpshop__entity`, `wp_wpshop__historique`, `wp_wpshop__message`, `wp_wpshop__attribute_value_options`;");
 			$query = $wpdb->query("DELETE FROM " . $wpdb->options . " WHERE `option_name` LIKE '%wpshop%';");
 
 			$wpshop_products_posts = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE 'wpshop_%';");
 			$list = '  ';
-			foreach($wpshop_products_posts as $post){
+			foreach ($wpshop_products_posts as $post) {
 				$list .= "'" . $post->ID . "', ";
 			}
 			$list = substr($list, 0, -2);
 
 			$wpshop_products_posts = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_parent IN (" . $list . ");");
 			$list_attachment = '  ';
-			foreach($wpshop_products_posts as $post){
+			foreach ($wpshop_products_posts as $post) {
 				$list_attachment .= "'" . $post->ID . "', ";
 			}
 			$list_attachment = substr($list_attachment, 0, -2);
@@ -2337,9 +2337,9 @@ 
 
 		/*	Unset administrator permission	*/
 		$adminRole = get_role('administrator');
-		foreach($adminRole->capabilities as $capabilityName => $capability){
-			if(substr($capabilityName, 0, 7) == 'wpshop_'){
-				if($adminRole->has_cap($capabilityName)){
+		foreach ($adminRole->capabilities as $capabilityName => $capability) {
+			if (substr($capabilityName, 0, 7) == 'wpshop_') {
+				if ($adminRole->has_cap($capabilityName)) {
 					$adminRole->remove_cap($capabilityName);
 				}
 			}

Braces +21 added lines, -24 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' ) ) {
@@ -142,10 +144,12 @@ 
 		$defined_sample_datas = new SimpleXMLElement( $sample_datas, LIBXML_NOCDATA );
 
 		$namespaces = $defined_sample_datas->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) )
-			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		if ( ! isset( $namespaces['excerpt'] ) )
-			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+		if ( ! isset( $namespaces['wp'] ) ) {
+					$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
+		}
+		if ( ! isset( $namespaces['excerpt'] ) ) {
+					$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+		}
 
 		foreach ( $defined_sample_datas->xpath( '//wpshop_products/wpshop_product' ) as $product ) {
 			$dc = $product->children( 'http://purl.org/dc/elements/1.1/' );
@@ -509,8 +513,7 @@ 
 									$new_set_section_infos['attribute_set_id'] = $attribute_set_id;
 									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
 									$attribute_set_section_id = $wpdb->insert_id;
-								}
-								else{
+								} else{
 									$new_set_section_infos = $set_group_infos;
 									$new_set_section_infos['last_update_date'] = current_time('mysql', 0);
 									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
@@ -519,8 +522,7 @@ 
 								if(($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))){
 									if(count($set_group_infos_details) <= 0){
 										$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
-									}
-									else{
+									} else{
 										$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
 										$last_position = $wpdb->get_var($query);
 										$position = (int)$last_position + 1;
@@ -582,8 +584,7 @@ 
 							$wpdb->update( $wpdb->usermeta, array( 'meta_value' => serialize( $current_order ), ), array( 'umeta_id' => $customer_metabox_order->umeta_id ) );
 						}
 					}
-				}
-				else {
+				} else {
 					$users = get_users( array( 'role' => 'administrator', ) );
 					if ( !empty( $users ) ) {
 						foreach ( $users as $user ) {
@@ -960,7 +961,9 @@ 
 						$options_args = array();
 						$options_args[$addon_name]['activate'] = $addon_state;
 						$options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
-						if (! $addon_state ) $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						if (! $addon_state ) {
+							$options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						}
 						add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
 					}
 					delete_option('wpshop_addons_state');
@@ -1028,8 +1031,7 @@ 
 									$civility = $miss_id;
 								break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1076,8 +1078,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$shipping_address = array();
@@ -1130,8 +1131,7 @@ 
 									$civility = $mister_id ;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1164,8 +1164,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$shipping_address = array('address_title' => $shipping_title,
@@ -1295,8 +1294,7 @@ 
 									$civility = $mister_id ;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id ;
 						}
 						$billing_address = array('address_title' => $billing_title,
@@ -1332,8 +1330,7 @@ 
 									$civility = $miss_id;
 									break;
 							}
-						}
-						else {
+						} else {
 							$civility = $mister_id;
 						}
 						$shipping_address = array('address_title' => $shipping_title,

includes/librairies/payments/cic.class.php

Doc Comments +12 added lines

@@ -79,6 +79,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param string[] $aConstants
+	 */
 	private function _checkTpeParams($aConstants) {
 
 		for ($i = 0; $i < count($aConstants); $i++)
@@ -105,6 +108,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param CMCIC_Tpe $oTpe
+	 */
 	function __construct($oTpe) {
 
 		$this->_sUsableKey = $this->_getUsableKey($oTpe);
@@ -147,6 +153,9 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
+	/**
+	 * @param string $sData
+	 */
 	public function computeHmac($sData) {
 
 		return strtolower(hash_hmac("sha1", $sData, $this->_sUsableKey));
@@ -196,6 +205,9 @@ 
 //                           ********************
 //              Encodage des caract�res sp�ciaux au format HTML
 // ----------------------------------------------------------------------------
+/**
+ * @param string $data
+ */
 function HtmlEncode ($data)
 {
     $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";

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>
@@ -448,16 +448,16 @@ 
 	}
 
 
-	function display_admin_part( $k ) {
+	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="'.$cmcic_params['cle'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('TPE', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="'.$cmcic_params['tpe'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('Version', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="'.$cmcic_params['version'].'" /> => 3.0<br />';
-		$output .= '<label class="simple_right">'.__('Serveur', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="'.$cmcic_params['serveur'].'" /><br />';
-		$output .= '<label class="simple_right">'.__('Company code', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="'.$cmcic_params['codesociete'].'" /><br />';
+		$output .= '<label class="simple_right">' . __('Key', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="' . $cmcic_params['cle'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('TPE', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="' . $cmcic_params['tpe'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Version', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="' . $cmcic_params['version'] . '" /> => 3.0<br />';
+		$output .= '<label class="simple_right">' . __('Serveur', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="' . $cmcic_params['serveur'] . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Company code', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="' . $cmcic_params['codesociete'] . '" /><br />';
 		$output .= '</div>';
 
 		return $output;

includes/librairies/payments/payment.class.php

Doc Comments +7 added lines, -2 removed lines

@@ -38,6 +38,10 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $param
+	 * @param string $value
+	 */
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
 		if($interoguation_marker_pos===false)
@@ -86,7 +90,7 @@ 
 	 * Display the list of payment methods available
 	 *
 	 * @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
+	 * @return string[] The different payment method
 	 */
 	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
 		$output = '';
@@ -377,7 +381,7 @@ 
 	 * Allows to inform customer that he would pay a partial amount on this order
 	 *
 	 * @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
+	 * @return string The amount to pay / A html output with amount to pay and different information
 	 */
 	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
 		$output = '';
@@ -482,6 +486,7 @@ 
 	 * @param array $order_meta The complete order meta informations
 	 * @param integer $payment_index The payment to add/update data for
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
+	 * @param integer $order_id
 	 * @return array The order new meta informations
 	 */
 	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {

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;

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';
 				}
 
@@ -655,16 +656,14 @@ 
 				}
 
 				$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);

Spacing +192 added lines, -192 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'] : $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'] : $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_']) && ( __( $item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __( $item['item_is_downloadable_'], 'wpshop') == __('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_']) && (__($item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __($item['item_is_downloadable_'], 'wpshop') == __('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=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=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,23 +635,23 @@ 
 				}
 
 				$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, $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, $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' ) {
-					$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') {
+					$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));
 				}
 
 				$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);
@@ -661,13 +661,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);
 		}
 	}
 
@@ -679,11 +679,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;
@@ -702,26 +702,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 {
@@ -732,16 +732,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;

includes/librairies/pdf/font/makefont/makefont.php

Doc Comments +4 added lines

@@ -229,6 +229,10 @@
 	return rtrim($s);
 }
 
+/**
+ * @param string $file
+ * @param string $s
+ */
 function SaveToFile($file, $s, $mode)
 {
 	$f=fopen($file,'w'.$mode);

includes/librairies/pdf/fpdf.php

Doc Comments +48 added lines

@@ -165,6 +165,10 @@ 
 	$this->PDFVersion='1.3';
 }
 
+/**
+ * @param double $left
+ * @param double $top
+ */
 function SetMargins($left, $top, $right=null)
 {
 	//Set left, top and right margins
@@ -195,6 +199,9 @@ 
 	$this->rMargin=$margin;
 }
 
+/**
+ * @param boolean $auto
+ */
 function SetAutoPageBreak($auto, $margin=0)
 {
 	//Set auto page break mode and triggering margin
@@ -203,6 +210,9 @@ 
 	$this->PageBreakTrigger=$this->h-$margin;
 }
 
+/**
+ * @param string $zoom
+ */
 function SetDisplayMode($zoom, $layout='continuous')
 {
 	//Set display mode in viewer
@@ -216,6 +226,9 @@ 
 		$this->Error('Incorrect layout display mode: '.$layout);
 }
 
+/**
+ * @param boolean $compress
+ */
 function SetCompression($compress)
 {
 	//Set page compression
@@ -271,6 +284,9 @@ 
 	$this->AliasNbPages=$alias;
 }
 
+/**
+ * @param string $msg
+ */
 function Error($msg)
 {
 	//Fatal error
@@ -444,6 +460,12 @@ 
 	$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));
 }
 
+/**
+ * @param integer $x
+ * @param integer $y
+ * @param integer $w
+ * @param integer $h
+ */
 function Rect($x, $y, $w, $h, $style='')
 {
 	//Draw a rectangle
@@ -504,6 +526,9 @@ 
 	}
 }
 
+/**
+ * @param string $family
+ */
 function SetFont($family, $style='', $size=0)
 {
 	//Select a font; size given in points
@@ -595,6 +620,10 @@ 
 	$this->links[$link]=array($page, $y);
 }
 
+/**
+ * @param double $y
+ * @param string $link
+ */
 function Link($x, $y, $w, $h, $link)
 {
 	//Put a link on the page
@@ -697,6 +726,11 @@ 
 		$this->x+=$w;
 }
 
+/**
+ * @param integer $w
+ * @param integer $h
+ * @param string $txt
+ */
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
 	//Output text with automatic or explicit line breaks
@@ -988,6 +1022,10 @@ 
 		$this->y=$this->h+$y;
 }
 
+/**
+ * @param integer $x
+ * @param integer $y
+ */
 function SetXY($x, $y)
 {
 	//Set x and y positions
@@ -1080,6 +1118,9 @@ 
 		@set_magic_quotes_runtime(0);
 }
 
+/**
+ * @param string $format
+ */
 function _getpageformat($format)
 {
 	$format=strtolower($format);
@@ -1096,6 +1137,10 @@ 
 	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
 }
 
+/**
+ * @param string $orientation
+ * @param string $format
+ */
 function _beginpage($orientation, $format)
 {
 	$this->page++;
@@ -1226,6 +1271,9 @@ 
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 }
 
+/**
+ * @param string $file
+ */
 function _parsepng($file)
 {
 	//Extract info from a PNG file

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

Doc Comments +12 added lines

@@ -57,6 +57,10 @@ 
 	}
 
 	// Cr�ation r�cursive de dossiers
+
+	/**
+	 * @param string $path
+	 */
 	function make_recursiv_dir($path, $rights = 0777) {
 		if (!@is_dir($path)) {
 			$folder_path = array($path);
@@ -313,6 +317,11 @@ 
 	}
 
 	// Affiche un ligne de la facture
+
+	/**
+	 * @param integer[] $dim_array
+	 * @param string $currency
+	 */
 	function row($row, $dim_array, $currency) {
 
 		// S�curit�
@@ -336,6 +345,9 @@ 
 		$this->Ln();
 	}
 
+	/**
+	 * @param string $currency
+	 */
 	function total($order_id, $currency, $invoice_id = null) {
 
 		/* Donn�es commande */

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/purchase/checkout.class.php

Doc Comments +4 added lines

@@ -260,6 +260,10 @@
 		}
 	}
 
+	/**
+	 * @param string $token
+	 * @param string $login
+	 */
 	public static function direct_payment_link( $token, $order_id, $login ) {
 
 		global $wpdb;

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 	var $creating_account = true;
 
 	/** Constructor of the class
-	* @return void
-	*/
+	 * @return void
+	 */
 	function __construct () {
 	}
 

Braces +15 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' ) ) {
@@ -58,12 +60,13 @@ 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
 						update_post_meta($order_id, '_wpshop_order_customer_id', $user_id);
+					} else {
+						$wpshop->add_error(__('You don\'t own the order', 'wpshop'));
 					}
-					else $wpshop->add_error(__('You don\'t own the order', 'wpshop'));
+				} else {
+					$wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 				}
-				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
-			}
-			else{
+			} else{
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
@@ -106,7 +109,9 @@ 
 
 				}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if(!empty($download_codes)) {
+					update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				}
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -128,8 +133,7 @@ 
 				// Si c'est un devis
 				if ( $paymentMethod == 'quotation' ) {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
-				}
-				else {
+				} else {
 					$order['order_key'] = wpshop_orders::get_new_order_reference();
 				}
 
@@ -190,8 +194,7 @@ 
 
 				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
-				}
-				else {
+				} else {
 					$email_option = get_option( 'wpshop_emails' );
 					if ( empty($email_option['send_confirmation_order_message']) ) {
 						$payment_method_option = get_option( 'wps_payment_mode' );
@@ -245,8 +248,7 @@ 
 
 			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
-			}
-			else {
+			} else {
 				$message_type = 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE';
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
@@ -288,8 +290,7 @@ 
 				$_SESSION['order_id'] = $order_id;
 				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login) );
 				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ) );
-			}
-			else {
+			} else {
 				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_myaccount_page_id') ) ) );
 			}
 

Spacing +75 added lines, -75 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'));
 }
 
 /**
@@ -25,11 +25,11 @@ 
 	/** Constructor of the class
 	* @return void
 	*/
-	function __construct () {
+	function __construct() {
 	}
 
 
-	public static function process_checkout($paymentMethod='paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
+	public static function process_checkout($paymentMethod = 'paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
 
 		global $wpdb, $wpshop, $wpshop_cart;
 		$wps_message = new wps_message_ctr();
@@ -38,22 +38,22 @@ 
 		if (is_user_logged_in()) :
 			$user_id = get_current_user_id();
 
-		if ( $customer_id != 0 ) {
+		if ($customer_id != 0) {
 			$user_id = $customer_id;
 		}
 
 			// If the order is already created in the db
-			if(!empty($order_id) && is_numeric($order_id)) {
+			if (!empty($order_id) && is_numeric($order_id)) {
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 
-				if(!empty($order)) {
-					if($order['customer_id'] == $user_id) {
+				if (!empty($order)) {
+					if ($order['customer_id'] == $user_id) {
 						$order['payment_method'] = $paymentMethod;
-						$_SESSION['order_id'] = wpshop_tools::varSanitizer( $order_id );
+						$_SESSION['order_id'] = wpshop_tools::varSanitizer($order_id);
 						// Store cart in session
 						//wpshop_cart::store_cart_in_session($order);
 						// Add a payment
-						$order['order_payment']['received'][] = array( 'method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$order['order_payment']['received'][] = array('method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
@@ -63,12 +63,12 @@ 
 				}
 				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 			}
-			else{
+			else {
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
+					'post_title' => sprintf(__('Order - %s', 'wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
 					'post_status' => 'publish',
-					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field( $_POST['wps-customer-comment'] ) : '',
+					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field($_POST['wps-customer-comment']) : '',
 					'post_author' => $user_id,
 					'comment_status' => 'closed'
 				);
@@ -78,7 +78,7 @@ 
 				$order_tva = array();
 
 				//$cart = (array)$wpshop_cart->cart;
-				if ( !empty($_SESSION['cart']) && !empty( $_SESSION['cart']['shipping_method']) ) {
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['shipping_method'])) {
 					$_SESSION['cart']['shipping_method'] = __('Standard shipping method', 'wpshop');
 				}
 				$cart = (array)$_SESSION['cart'];
@@ -90,23 +90,23 @@ 
 				$_SESSION['order_id'] = $order_id;
 
 				// Cr�ation des codes de t�l�chargement si il y a des produits t�l�chargeable dans le panier
-				if ( !empty( $cart['order_items']  ) ) {
-				foreach($cart['order_items'] as $c) {
+				if (!empty($cart['order_items'])) {
+				foreach ($cart['order_items'] as $c) {
 					$product = wpshop_products::get_product_data($c['item_id']);
 					/** Check if it's a variation and check the parent product **/
-					if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-						$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-						if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+					if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+						$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+						if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 							$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 						}
 					}
-					if(!empty($product['is_downloadable_'])) {
+					if (!empty($product['is_downloadable_'])) {
 						$download_codes[$c['item_id']] = array('item_id' => $c['item_id'], 'download_code' => uniqid('', true));
 					}
 
 				}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if (!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_' . $order_id, $download_codes);
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -121,12 +121,12 @@ 
 					'order_payment' 		=> array(
 					'customer_choice' 		=> array('method' => $paymentMethod),
 					'received'				=> array('0' => array('method' => $paymentMethod, 'waited_amount' => $cart['order_amount_to_pay_now'], 'status' =>  'waiting_payment', 'author' => $user_id)),
-					'shipping_method'       => ( ( !empty( $_SESSION['shipping_method']) ) ? wpshop_tools::varSanitizer( $_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop') )
+					'shipping_method'       => ((!empty($_SESSION['shipping_method'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop'))
 					),
 				), $cart);
 
 				// Si c'est un devis
-				if ( $paymentMethod == 'quotation' ) {
+				if ($paymentMethod == 'quotation') {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
 				}
 				else {
@@ -134,9 +134,9 @@ 
 				}
 
 				//Round final amount
-				$order['order_grand_total'] = number_format( round($order['order_grand_total'], 2), 2, '.', '');
-				$order['order_total_ttc'] = number_format( round($order['order_total_ttc'], 2), 2, '.', '');
-				$order['order_amount_to_pay_now'] = number_format( round($order['order_amount_to_pay_now'], 2), 2, '.', '');
+				$order['order_grand_total'] = number_format(round($order['order_grand_total'], 2), 2, '.', '');
+				$order['order_total_ttc'] = number_format(round($order['order_total_ttc'], 2), 2, '.', '');
+				$order['order_amount_to_pay_now'] = number_format(round($order['order_amount_to_pay_now'], 2), 2, '.', '');
 
 				/** On enregistre la commande	*/
 				update_post_meta($order_id, '_order_postmeta', $order);
@@ -145,75 +145,75 @@ 
 				update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 
-				do_action( 'wps_order_extra_save', $order_id );
+				do_action('wps_order_extra_save', $order_id);
 
 				//Add an action to extra actions on order save
 				// @TODO : REQUEST
-				$args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST);
-				wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+				$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+				wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 
 				/**	Set custmer information for the order	*/
-				$shipping_address =  ( !empty($shipping_address_option) && !empty($shipping_address_option['activate']) ) ? ( ( !empty($_SESSION['shipping_address']) ) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id ) : '';
-				$billing_address =  ( !empty($_SESSION['billing_address']) ) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
+				$shipping_address = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? ((!empty($_SESSION['shipping_address'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id) : '';
+				$billing_address = (!empty($_SESSION['billing_address'])) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
 
 
-				if ( !empty( $billing_address) ) {
+				if (!empty($billing_address)) {
 					wpshop_orders::set_order_customer_addresses($user_id, $order_id, $shipping_address, $billing_address);
 				}
 
-				if ( !empty($_SESSION['shipping_address_to_save']) ) {
+				if (!empty($_SESSION['shipping_address_to_save'])) {
 					$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 					$order_infos_postmeta['shipping']['address'] = $_SESSION['shipping_address_to_save'];
 					$order_infos_postmeta['shipping']['address_id'] = '';
 					update_post_meta($order_id, '_order_info', $order_infos_postmeta);
-					unset( $_SESSION['shipping_address_to_save'] );
+					unset($_SESSION['shipping_address_to_save']);
 				}
 
 
 				/** Save Coupon use **/
-				if ( !empty($_SESSION['cart']['coupon_id']) ) {
+				if (!empty($_SESSION['cart']['coupon_id'])) {
 					$wps_coupon_mdl = new wps_coupon_model();
-					$wps_coupon_mdl->save_coupon_use( $_SESSION['cart']['coupon_id'] );
+					$wps_coupon_mdl->save_coupon_use($_SESSION['cart']['coupon_id']);
 				}
 
 				/**	Notify the customer as the case	*/
 				$user_info = get_userdata($user_id);
 				$email = $user_info->user_email;
-				$first_name = $user_info->user_firstname ;
+				$first_name = $user_info->user_firstname;
 				$last_name = $user_info->user_lastname;
 
 				// Envoie du message de confirmation de commande au client
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 
-				$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'] : '');
 
-				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
+				if (!empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 				}
 				else {
-					$email_option = get_option( 'wpshop_emails' );
-					if ( empty($email_option['send_confirmation_order_message']) ) {
-						$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'];
+					$email_option = get_option('wpshop_emails');
+					if (empty($email_option['send_confirmation_order_message'])) {
+						$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'];
 
-						$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, 'order_personnal_informations' => '' ) );
+						$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, 'order_personnal_informations' => ''));
 					}
 				}
 
-				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) && empty($email_option['send_confirmation_order_message']) ) ){
-						self::send_order_email_to_administrator( $order_id, $user_info );
+					if (empty($email_option) || (!empty($email_option) && empty($email_option['send_confirmation_order_message']))) {
+						self::send_order_email_to_administrator($order_id, $user_info);
 					}
 				}
 
 
 				/** IF Order amount is 0, Finish the Order **/
-				if ( $cart['order_amount_to_pay_now'] == 0 ) {
+				if ($cart['order_amount_to_pay_now'] == 0) {
 					$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 					$payment_status = 'completed';
-					$params_array = array (
+					$params_array = array(
 						'method' =>'free',
 						'waited_amount' => $order_meta['order_amount_to_pay_now'],
 						'status' =>  'payment_received',
@@ -224,14 +224,14 @@ 
 					);
 					wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 				}
-				apply_filters( 'wpshop_finish_order_extra_actions', $order_id);
+				apply_filters('wpshop_finish_order_extra_actions', $order_id);
 			}
 		endif;
 		return $order_id;
 	}
 
-	public static function send_order_email_to_administrator ( $order_id, $customer_infos = ''  ) {
-		if ( !empty($order_id) ) {
+	public static function send_order_email_to_administrator($order_id, $customer_infos = '') {
+		if (!empty($order_id)) {
 			$wps_message = new wps_message_ctr();
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			//Send email to administrator(s)
@@ -239,11 +239,11 @@ 
 			$shop_admin_email = $shop_admin_email_option['contact_email'];
 			$order_tmp_key = '';
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ( (!empty($order_infos['order_payment']['shipping_method']) ) ? $order_infos['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ((!empty($order_infos['order_payment']['shipping_method'])) ? $order_infos['order_payment']['shipping_method'] : '');
 
 
-			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
+			if (!empty($order_infos) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key'])) {
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
 			}
 			else {
@@ -251,23 +251,23 @@ 
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
 
-			$payment_method_option = get_option( 'wps_payment_mode' );
-			$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['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_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
 
-			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => ( !empty($customer_infos) && !empty($customer_infos->user_email) ) ? $customer_infos->user_email : '' , 'customer_last_name' => ( !empty($customer_infos) && !empty($customer_infos->user_lastname) ) ? $customer_infos->user_lastname : '', 'customer_first_name' => ( !empty($customer_infos) && !empty($customer_infos->user_firstname) ) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '','order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' );
+			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => (!empty($customer_infos) && !empty($customer_infos->user_email)) ? $customer_infos->user_email : '', 'customer_last_name' => (!empty($customer_infos) && !empty($customer_infos->user_lastname)) ? $customer_infos->user_lastname : '', 'customer_first_name' => (!empty($customer_infos) && !empty($customer_infos->user_firstname)) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '');
 
-			$wps_message->wpshop_prepared_email( $shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
+			$wps_message->wpshop_prepared_email($shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
 		}
 	}
 
-	public static function direct_payment_link( $token, $order_id, $login ) {
+	public static function direct_payment_link($token, $order_id, $login) {
 
 		global $wpdb;
-		if( !empty($token) && !empty($order_id) && !empty($login) ) {
+		if (!empty($token) && !empty($order_id) && !empty($login)) {
 			/** Verify informations **/
-			$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->users. ' WHERE user_login = %s AND user_activation_key = %s', $login, $token);
-			$user_infos = $wpdb->get_row( $query );
-			if( !empty($user_infos) ) {
+			$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->users . ' WHERE user_login = %s AND user_activation_key = %s', $login, $token);
+			$user_infos = $wpdb->get_row($query);
+			if (!empty($user_infos)) {
 				/** Connect the user **/
 				$secure_cookie = is_ssl() ? true : false;
 				wp_set_auth_cookie($user_infos->ID, true, $secure_cookie);
@@ -276,21 +276,21 @@ 
 				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 				$_SESSION['cart'] = array();
 				$_SESSION['cart']['order_items'] = array();
-				if ( !empty($order_meta) && !empty( $order_meta['order_items']) ) {
+				if (!empty($order_meta) && !empty($order_meta['order_items'])) {
 					$wpshop_cart_type = 'cart';
-					foreach( $order_meta['order_items'] as $item ) {;
+					foreach ($order_meta['order_items'] as $item) {;
 						$_SESSION['cart']['order_items'][$item['item_id']] = $item;
 					}
 					$wps_cart_ctr = new wps_cart();
-					$order = $wps_cart_ctr->calcul_cart_information( array() );
-					$wps_cart_ctr->store_cart_in_session( $order );
+					$order = $wps_cart_ctr->calcul_cart_information(array());
+					$wps_cart_ctr->store_cart_in_session($order);
 				}
 				$_SESSION['order_id'] = $order_id;
-				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login) );
-				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ) );
+				$wpdb->update($wpdb->users, array('user_activation_key' => ''), array('user_login' => $login));
+				wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))));
 			}
 			else {
-				wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option('wpshop_myaccount_page_id') ) ) );
+				wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 			}
 
 		}

includes/librairies/purchase/orders.class.php

Doc Comments +6 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
+	* @return string
 	*/
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -285,7 +285,7 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
+	* @return string
 	*/
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -650,6 +650,10 @@ 
 
 		return $output;
 	}
+
+	/**
+	 * @param boolean $state
+	 */
 	static function display_customer_pay_quotation( $state, $oid ) {
 		$btn = '<a role="button" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Customer can pay', 'wpshop').'</a>';
 		if( $state ) {

Indentation +7 added lines, -7 removed lines

@@ -243,7 +243,7 @@ 
 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
-	*/
+	 */
 	function order_generate_billing_number($order_id, $force_invoicing = false){
 		global $wpdb, $wpshop_modules_billing;
 
@@ -264,8 +264,8 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
-	*/
+	 * @return int
+	 */
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
@@ -285,8 +285,8 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
-	*/
+	 * @return int
+	 */
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
@@ -348,7 +348,7 @@ 
 
 	/** Set the custom colums
 	 * @return array
-	*/
+	 */
 	static function orders_edit_columns($columns){
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
@@ -367,7 +367,7 @@ 
 
 	/** Give the content by column
 	 * @return array
-	*/
+	 */
 	public static function orders_custom_columns($column, $post_id) {
 		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
 			global $civility, $order_status;

Braces +14 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Products management method file
  *
@@ -132,8 +134,7 @@ 
 		$order_main_info .= '<div class="wps-product-section">';
 		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
 			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
-		}
-		else{
+		} else{
 			if(!empty($order_postmeta['order_key'])){
 				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
 			}
@@ -148,8 +149,7 @@ 
 				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID;
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
 				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
-			}
-			else {
+			} else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
 			}
 		}
@@ -195,8 +195,7 @@ 
 			if ( empty($credit_meta) ) {
 				if( $order_postmeta['order_status'] == 'refunded') {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
-				}
-				else {
+				} else {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
@@ -276,8 +275,7 @@ 
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
 		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
@@ -297,8 +295,7 @@ 
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		if($save){
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
@@ -332,8 +329,7 @@ 
 					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 				}
 			}
-		}
-		else {
+		} else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
 			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
@@ -394,8 +390,7 @@ 
 				case "order_billing":
 					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
 						$billing = $addresses['billing']['address'];
-					}
-					else if ( !empty($addresses['billing']) ) {
+					} else if ( !empty($addresses['billing']) ) {
 						$billing = $addresses['billing'];
 					}
 					if ( !empty($billing) ) {
@@ -403,8 +398,7 @@ 
 						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
 						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
 						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
-					}
-					else {
+					} else {
 						echo __('No information available for user billing', 'wpshop');
 					}
 				break;
@@ -412,8 +406,7 @@ 
 				case "order_shipping":
 					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
 						$shipping = $addresses['shipping']['address'];
-					}
-					else if ( !empty($addresses['shipping']) ) {
+					} else if ( !empty($addresses['shipping']) ) {
 						$shipping = $addresses['shipping'];
 					}
 					if ( !empty($shipping) ) {
@@ -421,8 +414,7 @@ 
 						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
 						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
 						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
-					}
-					else{
+					} else{
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
@@ -435,8 +427,7 @@ 
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
 							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
-						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						} else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';

Spacing +138 added lines, -138 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Products management method file
  *
@@ -10,8 +10,8 @@ 
  */
 
 /*	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'));
 }
 
 /**
@@ -70,7 +70,7 @@ 
 		/**	Add action button	*/
 		add_meta_box(
 			'wpshop_order_actions',
-			'<span class="dashicons dashicons-info"></span> '.__('Actions on order', 'wpshop'),
+			'<span class="dashicons dashicons-info"></span> ' . __('Actions on order', 'wpshop'),
 			array('wpshop_orders', 'order_actions'),
 				WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'high'
 		);
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param object $order The current order being edited
 	 */
-	public static function order_actions( $order ) {
+	public static function order_actions($order) {
 		$output = '';
 
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
@@ -118,37 +118,37 @@ 
 
 		$tpl_component = array();
 
-		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url( get_delete_post_link($order->ID) ) , 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') :  __('Move to Trash', 'wpshop'))), array(), 'admin');
-		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can( "delete_post", $order->ID ) ? $delete_button : '';
+		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url(get_delete_post_link($order->ID)), 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') : __('Move to Trash', 'wpshop'))), array(), 'admin');
+		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can("delete_post", $order->ID) ? $delete_button : '';
 
 		/**	Add an action list	*/
 		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = '';
 
 		/**	Display main information about the order	*/
 		$order_main_info = '';
-		if(!empty($order_postmeta['order_date'])){
-			$order_main_info .=  '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>'.__('Order date','wpshop').' : </strong><br/>'.mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true).'</div>';
+		if (!empty($order_postmeta['order_date'])) {
+			$order_main_info .= '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>' . __('Order date', 'wpshop') . ' : </strong><br/>' . mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true) . '</div>';
 		}
 		$order_main_info .= '<div class="wps-product-section">';
-		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
-			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
+		if (empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))) {
+			$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Temporary quotation reference', 'wpshop') . ': </strong>' . self::get_new_pre_order_reference(false) . '<br/>';
 		}
-		else{
-			if(!empty($order_postmeta['order_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
+		else {
+			if (!empty($order_postmeta['order_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Order reference', 'wpshop') . ' : </strong>' . $order_postmeta['order_key'] . '<br/>';
 			}
-			if(!empty($order_postmeta['order_temporary_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Pre-order reference','wpshop').': </strong>'.$order_postmeta['order_temporary_key'].'<br/>';
-				$post_ID = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-				$order_main_info .= '<a href="' .WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $post_ID . '&mode=pdf">' .__('Download the quotation', 'wpshop'). '</a><br />';
+			if (!empty($order_postmeta['order_temporary_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Pre-order reference', 'wpshop') . ': </strong>' . $order_postmeta['order_temporary_key'] . '<br/>';
+				$post_ID = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+				$order_main_info .= '<a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $post_ID . '&mode=pdf">' . __('Download the quotation', 'wpshop') . '</a><br />';
 			}
-			if(!empty($order_postmeta['order_invoice_ref'])){
+			if (!empty($order_postmeta['order_invoice_ref'])) {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ORDER_RECEIVED_PAYMENT_INVOICE_REF'] = $order_postmeta['order_invoice_ref'];
 				$sub_tpl_component['ADMIN_ORDER_PAYMENT_RECEIVED_LINE_CLASSES'] = '';
 				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID;
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
-				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Invoice number', 'wpshop') . ': </strong>' . $order_postmeta['order_invoice_ref'] . '<br/>' . $order_invoice_download . '';
 			}
 			else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
@@ -158,7 +158,7 @@ 
 
 
 		/*Add the current order status in display**/
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= ( !empty($order_postmeta['order_status']) ) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) ) : '';
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= (!empty($order_postmeta['order_status'])) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop'))) : '';
 
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= $order_main_info;
 
@@ -168,37 +168,37 @@ 
 		 * To check because notification is not really send
 		 *
 		 */
-		if ( !empty($order->post_author) ) {
+		if (!empty($order->post_author)) {
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '
 			<div class="wps-product-section wpshop_order_notify_customer_on_update_container" >
-				<input type="checkbox" name="notif_the_customer" id="wpshop_order_notif_the_customer_on_update" /> <label for="wpshop_order_notif_the_customer_on_update" >'.__('Send a notification to the customer', 'wpshop').'</label>
-				<!-- <br/><input type="checkbox" name="notif_the_customer_sendsms" id="wpshop_order_notif_the_customer_sendsms_on_update" /> <label for="wpshop_order_nnotif_the_customer_sendsms_on_update" >'.__('Send a SMS to the customer', 'wpshop').'</label> -->
+				<input type="checkbox" name="notif_the_customer" id="wpshop_order_notif_the_customer_on_update" /> <label for="wpshop_order_notif_the_customer_on_update" >'.__('Send a notification to the customer', 'wpshop') . '</label>
+				<!-- <br/><input type="checkbox" name="notif_the_customer_sendsms" id="wpshop_order_notif_the_customer_sendsms_on_update" /> <label for="wpshop_order_nnotif_the_customer_sendsms_on_update" >'.__('Send a SMS to the customer', 'wpshop') . '</label> -->
 			</div>';
 		}
 
-		if( ( ( !empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation' ) || !empty( $order_postmeta['order_temporary_key'] ) ) && $order_postmeta['order_status'] != 'canceled' && (float) $order_postmeta['order_amount_to_pay_now'] != (float) 0 ) {
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation( isset( $order_postmeta['pay_quotation'] ), $order->ID ) . '</div>';
+		if (((!empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation') || !empty($order_postmeta['order_temporary_key'])) && $order_postmeta['order_status'] != 'canceled' && (float)$order_postmeta['order_amount_to_pay_now'] != (float)0) {
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section">' . self::display_customer_pay_quotation(isset($order_postmeta['pay_quotation']), $order->ID) . '</div>';
 		}
 
 		/*Add the button regarding the order status**/
-		if ( !empty($order_postmeta['order_status']) ) {
-			switch ( $order_postmeta['order_status'] ) {
+		if (!empty($order_postmeta['order_status'])) {
+			switch ($order_postmeta['order_status']) {
 				case 'awaiting_payment':
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><a role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" >'.__('Send a payment link to customer', 'wpshop').'</a></div>';
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_'.$order->ID.'" >'.__('Cancel this order', 'wpshop').'</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><a role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" >' . __('Send a payment link to customer', 'wpshop') . '</a></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_' . $order->ID . '" >' . __('Cancel this order', 'wpshop') . '</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
 				break;
 				/*case 'completed' || 'shipped':
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_resend_order_to_customer" ><button class="wps-bton-second-mini-rounded wps_resend_order_to_customer order_' .$order->ID. '">' . __('Resend this order to customer', 'wpshop') . '</button><input type="hidden" id="resendordertocustomer_order_hidden_indicator" name="resendordertocustomer_order_hidden_indicator" /></div>';
 				break;*/
 			}
-			$credit_meta = get_post_meta( $order->ID, '_wps_order_credit', true );
+			$credit_meta = get_post_meta($order->ID, '_wps_order_credit', true);
 
-			if ( empty($credit_meta) ) {
-				if( $order_postmeta['order_status'] == 'refunded') {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .WPSHOP_TEMPLATES_URL. 'invoice.php?order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
+			if (empty($credit_meta)) {
+				if ($order_postmeta['order_status'] == 'refunded') {
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' . __('Credit Slip number', 'wpshop') . ' : <strong>' . ((!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref'])) ? '<a href="' . WPSHOP_TEMPLATES_URL . 'invoice.php?order_id=' . $order->ID . '&amp;invoice_ref=' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '&credit_slip=ok" target="_blank">' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '</a>' : '') . '</strong></div>';
 				}
 				else {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' . $order->ID . '">' . __('Refund this order', 'wpshop') . '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
 		}
@@ -210,7 +210,7 @@ 
 	function order_container_in_admin() {
 		global $post;
 		$output  = '<div id="wps_order_content_container">';
-		$output .= self::order_content( $post );
+		$output .= self::order_content($post);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -221,13 +221,13 @@ 
 	 *
 	 * @param order $post The complete order content
 	 */
-	function order_content( $post ) {
+	function order_content($post) {
 		$order_content = '';
 
 		$order = get_post_meta($post->ID, '_order_postmeta', true);
 
 		$order_content .= '<div id="order_product_container" class="order_product_container wpshop_cls" >';
-		if($order){/*	Read the order content if the order has product	*/
+		if ($order) {/*	Read the order content if the order has product	*/
 			$order_content .= '<input type="hidden" value="" name="order_products_to_delete" id="order_products_to_delete" />' . wpshop_cart::display_cart(true, $order, 'admin');
 			if (empty($order['order_invoice_ref'])) {
 				$order_content .= '<div id="order_refresh_button_container" class="wpshop_clear_block" ><input type="button" class="button-primary alignright wpshopHide" id="wpshop_admin_order_recalculate" value="' . __('Refresh order informations', 'wpshop') . '" /></div>';
@@ -245,18 +245,18 @@ 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
 	*/
-	function order_generate_billing_number($order_id, $force_invoicing = false){
+	function order_generate_billing_number($order_id, $force_invoicing = false) {
 		global $wpdb, $wpshop_modules_billing;
 
 		// Get the order from the db
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
 		// If the payment is completed
-		if(($order['order_status']=='completed') || $force_invoicing) {
+		if (($order['order_status'] == 'completed') || $force_invoicing) {
 
 			// If the reference hasn't been generated yet
-			if(empty($order['order_invoice_ref'])) {
-				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number( $order_id );
+			if (empty($order['order_invoice_ref'])) {
+				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number($order_id);
 
 				update_post_meta($order_id, '_order_postmeta', $order);
 			}
@@ -267,45 +267,45 @@ 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
 	* @return int
 	*/
-	public static function get_new_order_reference(){
+	public static function get_new_order_reference() {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_ORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_ORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
 	* @return int
 	*/
-	public static function get_new_pre_order_reference($save = true){
+	public static function get_new_pre_order_reference($save = true) {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
-		if($save){
+		if ($save) {
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_PREORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_PREORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 
@@ -320,24 +320,24 @@ 
 	 *
 	 *	@return void
 	 */
-	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id='', $billing_address_id=''){
+	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id = '', $billing_address_id = '') {
 		/**	Get order informations	*/
 		$billing_info['id'] = get_post_meta($billing_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-		$billing_info['address'] = get_post_meta($billing_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-		$billing_info['address_id'] = ( !empty($_SESSION['billing_address']) ) ? intval( $_SESSION['billing_address'] ) : '';
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
-			$partner_address_id = get_post_meta( $_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
+		$billing_info['address'] = get_post_meta($billing_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+		$billing_info['address_id'] = (!empty($_SESSION['billing_address'])) ? intval($_SESSION['billing_address']) : '';
+		if (!empty($_SESSION['shipping_partner_id'])) {
+			$partner_address_id = get_post_meta($_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
 			if (!empty($partner_address_id)) {
-				foreach( $partner_address_id as $address_id ) {
+				foreach ($partner_address_id as $address_id) {
 					$shipping_info['id'] = get_post_meta($address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+					$shipping_info['address'] = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 				}
 			}
 		}
 		else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
+			$shipping_info['address'] = get_post_meta($shipping_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$shipping_info['address_id'] = (!empty($_SESSION['shipping_address'])) ? intval($_SESSION['shipping_address']) : '';
 		}
 
 		$order_info = array('billing' => $billing_info, 'shipping' => $shipping_info);
@@ -350,7 +350,7 @@ 
 	/** Set the custom colums
 	 * @return array
 	*/
-	static function orders_edit_columns($columns){
+	static function orders_edit_columns($columns) {
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
 		'order_identifier' => __('Identifiers', 'wpshop'),
@@ -370,40 +370,40 @@ 
 	 * @return array
 	*/
 	public static function orders_custom_columns($column, $post_id) {
-		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 			global $civility, $order_status;
 
 			$metadata = get_post_custom();
 
-			$order_postmeta = isset($metadata['_order_postmeta'][0])?unserialize($metadata['_order_postmeta'][0]):'';
-			$addresses = get_post_meta($post_id,'_order_info', true);
+			$order_postmeta = isset($metadata['_order_postmeta'][0]) ? unserialize($metadata['_order_postmeta'][0]) : '';
+			$addresses = get_post_meta($post_id, '_order_info', true);
 
-			switch($column){
+			switch ($column) {
 				case "order_identifier":
-					if( !empty( $order_postmeta['order_key'] ) ) {
+					if (!empty($order_postmeta['order_key'])) {
 						echo '<b>' . $order_postmeta['order_key'] . '</b><br>';
 					}
-					if( !empty( $order_postmeta['order_invoice_ref'] ) ) {
-						echo ( !empty($order_postmeta['order_temporary_key'] ) ? '<b>' . $order_postmeta['order_invoice_ref'] . '</b>' :  '<i>' . $order_postmeta['order_invoice_ref'] . '</i>' );
+					if (!empty($order_postmeta['order_invoice_ref'])) {
+						echo (!empty($order_postmeta['order_temporary_key']) ? '<b>' . $order_postmeta['order_invoice_ref'] . '</b>' : '<i>' . $order_postmeta['order_invoice_ref'] . '</i>');
 					}
 				break;
 
 				case "order_status":
-					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_'.$post_id.'">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
+					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_' . $post_id . '">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
 				break;
 
 				case "order_billing":
-					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
+					if (!empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address'])) {
 						$billing = $addresses['billing']['address'];
 					}
-					else if ( !empty($addresses['billing']) ) {
+					else if (!empty($addresses['billing'])) {
 						$billing = $addresses['billing'];
 					}
-					if ( !empty($billing) ) {
-						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null).' <strong>'.(!empty($billing['address_first_name']) ? $billing['address_first_name'] : null).' '.(!empty($billing['address_last_name']) ? $billing['address_last_name'] : null).'</strong>';
-						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
-						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
-						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
+					if (!empty($billing)) {
+						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null) . ' <strong>' . (!empty($billing['address_first_name']) ? $billing['address_first_name'] : null) . ' ' . (!empty($billing['address_last_name']) ? $billing['address_last_name'] : null) . '</strong>';
+						echo empty($billing['company']) ? '<br />' : ', <i>' . $billing['company'] . '</i><br />';
+						echo (!empty($billing['address']) ? $billing['address'] : null) . '<br />';
+						echo (!empty($billing['postcode']) ? $billing['postcode'] : null) . ' ' . (!empty($billing['city']) ? $billing['city'] : null) . ', ' . (!empty($billing['country']) ? $billing['country'] : null);
 					}
 					else {
 						echo __('No information available for user billing', 'wpshop');
@@ -411,33 +411,33 @@ 
 				break;
 
 				case "order_shipping":
-					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
+					if (!empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address'])) {
 						$shipping = $addresses['shipping']['address'];
 					}
-					else if ( !empty($addresses['shipping']) ) {
+					else if (!empty($addresses['shipping'])) {
 						$shipping = $addresses['shipping'];
 					}
-					if ( !empty($shipping) ) {
-						echo '<strong>'.(!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null).' '.(!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null).'</strong>';
-						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
-						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
-						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
+					if (!empty($shipping)) {
+						echo '<strong>' . (!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null) . ' ' . (!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null) . '</strong>';
+						echo empty($shipping['company']) ? '<br />' : ', <i>' . $shipping['company'] . '</i><br />';
+						echo (!empty($shipping['address']) ? $shipping['address'] : null) . '<br />';
+						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null) . ' ' . (!empty($shipping['city']) ? $shipping['city'] : null) . ', ' . (!empty($shipping['country']) ? $shipping['country'] : null);
 					}
-					else{
+					else {
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
 
 				case "order_type":
-						echo '<a href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.(!empty($order_postmeta['order_temporary_key']) ? __('Quotation','wpshop') :  __('Basic order','wpshop')).'</a>';
+						echo '<a href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . (!empty($order_postmeta['order_temporary_key']) ? __('Quotation', 'wpshop') : __('Basic order', 'wpshop')) . '</a>';
 						$buttons = '<p class="row-actions">';
 						// Voir la commande
-						$buttons .= '<a class="button button-small" href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.__('View', 'wpshop').'</a>';
+						$buttons .= '<a class="button button-small" href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . __('View', 'wpshop') . '</a>';
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
-							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
+							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_' . $post_id . ' wps-bton-loader">' . __('Mark as shipped', 'wpshop') . '</a> ';
 						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment')) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';
@@ -450,7 +450,7 @@ 
 
 				case "order_total":
 					$currency = !empty($order_postmeta['order_currency']) ? $order_postmeta['order_currency'] : get_option('wpshop_shop_default_currency');
-					echo isset( $order_postmeta['order_grand_total'] ) ? number_format( $order_postmeta['order_grand_total'], 2, '.', '' ).' '.  wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
+					echo isset($order_postmeta['order_grand_total']) ? number_format($order_postmeta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
 				break;
 
 				/*case "order_actions":
@@ -478,10 +478,10 @@ 
 	}
 
 	public static function list_table_filters() {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
@@ -493,23 +493,23 @@ 
 				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, $entity_filter, '', 'index');
 				$min = $entity_filter_btpf;
 				$max = $entity_filter_btps;
-				echo ' <label for="entity_filter_btpf">'.__('Between two prices', 'wpshop').'</label> ';
-				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="'.__('Minimum price', 'wpshop').'"', null);
-				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="'.__('Maximum price', 'wpshop').'"', null);
+				echo ' <label for="entity_filter_btpf">' . __('Between two prices', 'wpshop') . '</label> ';
+				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="' . __('Minimum price', 'wpshop') . '"', null);
+				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="' . __('Maximum price', 'wpshop') . '"', null);
 			}
 		}
 	}
 
 	public static function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) && !empty( $entity_filter ) ) {
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'all':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -573,27 +573,27 @@ 
 						break;
 			}
 
-			if ( !empty( $check ) ) {
-				if( !empty($no_btp) && $no_btp == 'yes' ) {
+			if (!empty($check)) {
+				if (!empty($no_btp) && $no_btp == 'yes') {
 					$min = 'minimum';
 					$max = 'maximum';
 				} else {
-					$min = ( !empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf']) ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : 'minimum';
-					$max = ( !empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps']) ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : 'maximum';
+					$min = (!empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf'])) ? sanitize_text_field($_GET['entity_filter_btpf']) : 'minimum';
+					$max = (!empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps'])) ? sanitize_text_field($_GET['entity_filter_btps']) : 'maximum';
 				}
 				$results = $wpdb->get_results($sql_query);
 				$post_id_list = array();
 				$i = 0;
-				foreach($results as $item){
+				foreach ($results as $item) {
 					$meta_value = get_post_meta($item->ID, '_order_postmeta');
-					$price = ( !empty( $meta_value[0]['order_grand_total'] ) ) ? $meta_value[0]['order_grand_total'] : '';
-					if( $price >= $min || $min == 'minimum' ) {
-						if( $price <= $max || $max == 'maximum' ) {
+					$price = (!empty($meta_value[0]['order_grand_total'])) ? $meta_value[0]['order_grand_total'] : '';
+					if ($price >= $min || $min == 'minimum') {
+						if ($price <= $max || $max == 'maximum') {
 							$post_id_list[] = $item->ID;
 						}
 					}
 				}
-				if( empty($post_id_list) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
 				$query->query_vars[$check] = $post_id_list;
@@ -604,66 +604,66 @@ 
 
 
 
-	function latest_products_ordered ( $orders ) {
+	function latest_products_ordered($orders) {
 		global $wpdb;
 		$product_id = $output = '';
 		$products = array();
 		$display_option = get_option('wpshop_display_option');
-		if ( !empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered']) ) {
-			foreach( $orders as $order ) {
-				$order_content = get_post_meta( $order->ID, '_order_postmeta', true );
-				if ( !empty($order_content) && !empty( $order_content['order_items']) ) {
+		if (!empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered'])) {
+			foreach ($orders as $order) {
+				$order_content = get_post_meta($order->ID, '_order_postmeta', true);
+				if (!empty($order_content) && !empty($order_content['order_items'])) {
 
-					foreach( $order_content['order_items'] as $item ) {
-						if ( count( $products) >= $display_option['latest_products_ordered'] ) {
+					foreach ($order_content['order_items'] as $item) {
+						if (count($products) >= $display_option['latest_products_ordered']) {
 							continue;
 						}
 						$product_id = $item['item_id'];
-						if ( !empty( $item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition']) ) {
-							$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-							if ( !empty( $parent_def ) ) {
+						if (!empty($item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition'])) {
+							$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_def)) {
 								$parent_post = $parent_def['parent_post'];
 								$product_id = $parent_post->ID;
 							}
 						}
 
-						if ( !in_array($product_id, $products) ) {
+						if (!in_array($product_id, $products)) {
 							$products[] = $product_id;
 						}
 					}
 				}
 			}
-			if ( !empty($products) ) {
+			if (!empty($products)) {
 				$products_id = implode(",", $products);
-				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' .$products_id. '"]')) );
+				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' . $products_id . '"]')));
 			}
 		}
 		return $output;
 	}
 
-	function get_order_list_for_customer( $customer_id ) {
+	function get_order_list_for_customer($customer_id) {
 		global $wpdb;
 		$output = '';
 
-		if( !empty($customer_id) ) {
-			 $query = $wpdb->prepare( 'SELECT *
-							 		   FROM ' .$wpdb->posts. '
+		if (!empty($customer_id)) {
+			 $query = $wpdb->prepare('SELECT *
+							 		   FROM ' .$wpdb->posts . '
 							 		   WHERE post_author = %d
-							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			 $orders = $wpdb->get_results( $query );
+							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			 $orders = $wpdb->get_results($query);
 
-			 foreach( $orders as $order ) {
+			 foreach ($orders as $order) {
 
 			 }
 		}
 
 		return $output;
 	}
-	static function display_customer_pay_quotation( $state, $oid ) {
-		$btn = '<a role="button" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Customer can pay', 'wpshop').'</a>';
-		if( $state ) {
-			$url = wp_nonce_url( admin_url( 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link' ), 'wps_checkout_quotation', '_wpnonce' );
-			$btn .= '<br><a href="' . $url . '">' . __( 'Pay link', 'wpshop' ) . '</a>';
+	static function display_customer_pay_quotation($state, $oid) {
+		$btn = '<a role="button" class="wps-bton-' . (($state) ? 'third' : 'second') . '-mini-rounded quotation_is_payable_by_customer" href="#" >' . __('Customer can pay', 'wpshop') . '</a>';
+		if ($state) {
+			$url = wp_nonce_url(admin_url('admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link'), 'wps_checkout_quotation', '_wpnonce');
+			$btn .= '<br><a href="' . $url . '">' . __('Pay link', 'wpshop') . '</a>';
 		}
 		return $btn;
 	}