iNextrix / ASTPP

web_interface/astpp/application/libraries/html2pdf/_class/myPdf.class.php

Doc Comments +1 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      *
      * @param string  $orientation page orientation, same as TCPDF
      * @param string  $unit        User measure unit, 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 boolean $unicode     TRUE means that the input text is unicode (default = true)
      * @param String  $encoding    charset encoding; default is UTF-8
      * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
@@ -1407,7 +1407,6 @@ 
      * set $_myLastPageGroup;
      *
      * @access public
-     * @param integer $myLastPageGroup;
      * @param integer $myLastPageGroup
      */
     public function setMyLastPageGroup($myLastPageGroup)
@@ -1430,7 +1429,6 @@ 
      * set $_myLastPageGroupNb;
      *
      * @access public
-     * @param integer $myLastPageGroupNb;
      * @param integer $myLastPageGroupNb
      */
     public function setMyLastPageGroupNb($myLastPageGroupNb)

Braces +58 added lines, -23 removed lines

@@ -549,8 +549,12 @@ 
     public function setRotation($angle, $xC = null, $yC = null)
     {
         // if no center, rotate around the current posiition
-        if ($xC === null) $xC = $this->x;
-        if ($yC === null) $yC = $this->y;
+        if ($xC === null) {
+        	$xC = $this->x;
+        }
+        if ($yC === null) {
+        	$yC = $this->y;
+        }
 
         // prepare the coordinate
         $yC = ($this->h - $yC) * $this->k;
@@ -592,8 +596,9 @@ 
      */
     public function SetY($y, $resetx = true, $rtloff = false)
     {
-        if ($resetx)
-            $this->x = $this->lMargin;
+        if ($resetx) {
+                    $this->x = $this->lMargin;
+        }
 
         $this->y = $y;
     }
@@ -726,9 +731,13 @@ 
         $y4 = $y + $h;
 
         // get the Closing operator from the PDF Style
-        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';
+        }
 
         // drawing
         $this->_Point($x1, $y1, true);
@@ -772,9 +781,13 @@ 
     public function svgEllipse($x0, $y0, $rx, $ry, $style)
     {
         // get the Closing operator from the PDF Style
-        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';
+        }
 
         // drawing
         $this->_Arc($x0, $y0, $rx, $ry, 0, 2 * M_PI, true, true, true);
@@ -791,9 +804,13 @@ 
     public function svgPolygone($actions, $style)
     {
         // get the Closing operator from the PDF Style
-        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';
+        }
 
         // To save the First action and the last point
         $first = array('', 0, 0);
@@ -1004,7 +1021,9 @@ 
         $trans = false)
     {
         // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if ( ! $direction) $angleBegin += M_PI * 2.;
+        if ( ! $direction) {
+        	$angleBegin += M_PI * 2.;
+        }
 
         // cut in segment to convert in berize curv
         $dt = ($angleEnd - $angleBegin) / self::ARC_NB_SEGMENT;
@@ -1110,7 +1129,9 @@ 
         $v['s1']['y'] = -$v['s1']['xr'] * sin($angle) + $v['s1']['yr'] * cos($angle);
         $v['s1']['a1'] = atan2($v['y1'] - $v['s1']['y'], $v['x1'] - $v['s1']['x']);
         $v['s1']['a2'] = atan2($v['y2'] - $v['s1']['y'], $v['x2'] - $v['s1']['x']);
-        if ($v['s1']['a1'] > $v['s1']['a2']) $v['s1']['a1'] -= 2 * M_PI;
+        if ($v['s1']['a1'] > $v['s1']['a2']) {
+        	$v['s1']['a1'] -= 2 * M_PI;
+        }
 
         $v['s2'] = array();
         $v['s2']['t'] = -$v['s1']['t'];
@@ -1122,7 +1143,9 @@ 
         $v['s2']['y'] = -$v['s2']['xr'] * sin($angle) + $v['s2']['yr'] * cos($angle);
         $v['s2']['a1'] = atan2($v['y1'] - $v['s2']['y'], $v['x1'] - $v['s2']['x']);
         $v['s2']['a2'] = atan2($v['y2'] - $v['s2']['y'], $v['x2'] - $v['s2']['x']);
-        if ($v['s2']['a1'] > $v['s2']['a2']) $v['s2']['a1'] -= 2 * M_PI;
+        if ($v['s2']['a1'] > $v['s2']['a2']) {
+        	$v['s2']['a1'] -= 2 * M_PI;
+        }
 
         if ( ! $l) {
             if ($s) {
@@ -1170,8 +1193,11 @@ 
     {
         // load the last Transfomation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb - 1];
-        else        $m = array(1, 0, 0, 1, 0, 0);
+        if ($nb) {
+        	$m = $this->_transf[$nb - 1];
+        } else {
+        	$m = array(1, 0, 0, 1, 0, 0);
+        }
 
         // apply the Transformation Matrix
         list($x, $y) = array(($x * $m[0] + $y * $m[2] + $m[4]), ($x * $m[1] + $y * $m[3] + $m[5]));
@@ -1195,11 +1221,16 @@ 
     {
         // get the last Transformation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb - 1];
-        else        $m = array(1, 0, 0, 1, 0, 0);
+        if ($nb) {
+        	$m = $this->_transf[$nb - 1];
+        } else {
+        	$m = array(1, 0, 0, 1, 0, 0);
+        }
 
         // if no transform, get the Identity Matrix
-        if ( ! $n) $n = array(1, 0, 0, 1, 0, 0);
+        if ( ! $n) {
+        	$n = array(1, 0, 0, 1, 0, 0);
+        }
 
         // create the new Transformation Matrix
         $this->_transf[] = array(
@@ -1249,7 +1280,9 @@ 
         $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
 
         // it Label => add the FontSize to the height
-        if ($labelFontsize) $h += ($labelFontsize);
+        if ($labelFontsize) {
+        	$h += ($labelFontsize);
+        }
 
         // return the size of the barcode
         return array($w, $h);
@@ -1307,7 +1340,9 @@ 
 
             // Offset of the current level
             $level = $this->outlines[$i]['l'];
-            if ($level > 0) $this->Cell($level * 8);
+            if ($level > 0) {
+            	$this->Cell($level * 8);
+            }
 
             // Caption (cut to fit on the width page)
             $str = $this->outlines[$i]['t'];

web_interface/astpp/application/libraries/html2pdf/_class/parsingCss.class.php

Doc Comments +1 added lines

@@ -43,6 +43,7 @@
      * Set the HTML2PDF parent object
      *
      * @param  &HTML2PDF reference to the HTML2PDF parent $object
+     * @param HTML2PDF_myPdf|null $pdf
      * @access public
      */
     public function setPdfParent(&$pdf)

Braces +319 added lines, -128 removed lines

@@ -183,7 +183,9 @@ 
 
         // prepare the Collapse attribute
         $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if ( ! in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
+        if ( ! in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) {
+        	$collapse = false;
+        }
 
         // set the global css values
         $this->value['position']   = null;
@@ -319,20 +321,23 @@ 
         $style = $b.$i;
 
         if ($this->_defaultFont) {
-            if ($family == 'arial')
-                $family = 'helvetica';
-            elseif ($family == 'symbol' || $family == 'zapfdingbats')
-                $style = '';
+            if ($family == 'arial') {
+                            $family = 'helvetica';
+            } elseif ($family == 'symbol' || $family == 'zapfdingbats') {
+                            $style = '';
+            }
 
             $fontkey = $family.$style;
-            if ( ! $this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
+            if ( ! $this->_pdf->isLoadedFont($fontkey)) {
+                            $family = $this->_defaultFont;
+            }
         }
 
-        if ($family == 'arial')
-            $family = 'helvetica';
-        elseif ($family == 'symbol' || $family == 'zapfdingbats')
-            $style = '';
+        if ($family == 'arial') {
+                    $family = 'helvetica';
+        } elseif ($family == 'symbol' || $family == 'zapfdingbats') {
+                    $style = '';
+        }
 
         // complete style
         $style .= $u.$d.$o;
@@ -380,7 +385,9 @@ 
      */
     public function restorePosition()
     {
-        if ($this->value['y'] == $this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+        if ($this->value['y'] == $this->_pdf->getY()) {
+        	$this->_pdf->setY($this->value['yc'], false);
+        }
     }
 
      /**
@@ -401,18 +408,26 @@ 
         if ($this->value['position'] == 'relative' || $this->value['position'] == 'absolute') {
             if ($this->value['right'] !== null) {
                 $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x -= $this->value['margin']['r'];
+                if ($this->value['margin']['r']) {
+                	$x -= $this->value['margin']['r'];
+                }
             } else {
                 $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x += $this->value['margin']['l'];
+                if ($this->value['margin']['l']) {
+                	$x += $this->value['margin']['l'];
+                }
             }
 
             if ($this->value['bottom'] !== null) {
                 $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y -= $this->value['margin']['b'];
+                if ($this->value['margin']['b']) {
+                	$y -= $this->value['margin']['b'];
+                }
             } else {
                 $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y += $this->value['margin']['t'];
+                if ($this->value['margin']['t']) {
+                	$y += $this->value['margin']['t'];
+                }
             }
 
             if ($this->value['position'] == 'relative') {
@@ -425,8 +440,12 @@ 
         } else {
             $this->value['x'] = $currentX;
             $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x'] += $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y'] += $this->value['margin']['t'];
+            if ($this->value['margin']['l']) {
+            	$this->value['x'] += $this->value['margin']['l'];
+            }
+            if ($this->value['margin']['t']) {
+            	$this->value['y'] += $this->value['margin']['t'];
+            }
         }
 
         // save the new position
@@ -484,8 +503,12 @@ 
     {
         // prepare
         $tagName = strtolower($tagName);
-        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if ( ! $name) $name = null;
+        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if ( ! $name) {
+        	$name = null;
+        }
 
         // read the class attribute
         $class = array();
@@ -534,10 +557,18 @@ 
         // adding the style from the tag
         $styles = array_merge($styles, $param['style']);
 
-        if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
-        if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
-        if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1. * $styles['fill-opacity'];
+        if (isset($styles['stroke'])) {
+        	$this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
+        }
+        if (isset($styles['stroke-width'])) {
+        	$this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
+        }
+        if (isset($styles['fill'])) {
+        	$this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
+        }
+        if (isset($styles['fill-opacity'])) {
+        	$this->value['svg']['fill-opacity'] = 1. * $styles['fill-opacity'];
+        }
 
         return $this->value['svg'];
     }
@@ -554,8 +585,12 @@ 
     {
         // prepare the informations
         $tagName = strtolower($tagName);
-        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if ( ! $name) $name = null;
+        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if ( ! $name) {
+        	$name = null;
+        }
 
         // get the class names to use
         $class = array();
@@ -594,7 +629,9 @@ 
 
         // merge with the css styles from tag
         $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && ! isset($styles['width'])) $styles['width'] = '100%';
+        if (isset($param['allwidth']) && ! isset($styles['width'])) {
+        	$styles['width'] = '100%';
+        }
 
         // reset some styles, depending on the tag name
         $this->resetStyle($tagName);
@@ -603,8 +640,9 @@ 
         if ($legacy) {
             foreach ($legacy as $legacyName => $legacyValue) {
                 if (is_array($legacyValue)) {
-                    foreach ($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    foreach ($legacyValue as $legacy2Name => $legacy2Value) {
+                                            $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    }
                 } else {
                     $this->value[$legacyName] = $legacyValue;
                 }
@@ -647,13 +685,17 @@ 
                     break;
 
                 case 'text-transform':
-                    if ( ! in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
+                    if ( ! in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) {
+                    	$val = 'none';
+                    }
                     $this->value['text-transform'] = $val;
                     break;
 
                 case 'font-size':
                     $val = $this->convertToMM($val, $this->value['font-size']);
-                    if ($val) $this->value['font-size'] = $val;
+                    if ($val) {
+                    	$this->value['font-size'] = $val;
+                    }
                     break;
 
                 case 'color':
@@ -669,7 +711,9 @@ 
 
                 case 'text-align':
                     $val = strtolower($val);
-                    if ( ! in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+                    if ( ! in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) {
+                    	$val = 'left';
+                    }
                     $this->value['text-align'] = $val;
                     break;
 
@@ -679,7 +723,9 @@ 
 
                 case 'width':
                     $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1) == '%') $correctWidth = true;
+                    if ($this->value['width'] && substr($val, -1) == '%') {
+                    	$correctWidth = true;
+                    }
                     $noWidth = false;
                     break;
 
@@ -688,18 +734,26 @@ 
                     break;
 
                 case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val * 100).'%';
+                    if (preg_match('/^[0-9\.]+$/isU', $val)) {
+                    	$val = floor($val * 100).'%';
+                    }
                     $this->value['line-height'] = $val;
                     break;
 
                 case 'rotate':
-                    if ( ! in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val < 0) $val += 360;
+                    if ( ! in_array($val, array(0, -90, 90, 180, 270, -180, -270))) {
+                    	$val = null;
+                    }
+                    if ($val < 0) {
+                    	$val += 360;
+                    }
                     $this->value['rotate'] = $val;
                     break;
 
                 case 'overflow':
-                    if ( ! in_array($val, array('visible', 'hidden'))) $val = 'visible';
+                    if ( ! in_array($val, array('visible', 'hidden'))) {
+                    	$val = 'visible';
+                    }
                     $this->value['overflow'] = $val;
                     break;
 
@@ -893,34 +947,52 @@ 
                             $val[$valK] = $this->convertToMM($valV, 0);
                     }
                     $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['width'] = $val[3];
+                    if ($val[0]) {
+                    	$this->value['border']['t']['width'] = $val[0];
+                    }
+                    if ($val[1]) {
+                    	$this->value['border']['r']['width'] = $val[1];
+                    }
+                    if ($val[2]) {
+                    	$this->value['border']['b']['width'] = $val[2];
+                    }
+                    if ($val[3]) {
+                    	$this->value['border']['l']['width'] = $val[3];
+                    }
                     break;
 
                 case 'border-top-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['t']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['t']['width'] = $val;
+                    }
                     break;
 
                 case 'border-right-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['r']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['r']['width'] = $val;
+                    }
                     break;
 
                 case 'border-bottom-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['b']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['b']['width'] = $val;
+                    }
                     break;
 
                 case 'border-left-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['l']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['l']['width'] = $val;
+                    }
                     break;
 
                 case 'border-collapse':
-                    if ($tagName == 'table') $this->value['border']['collapse'] = ($val == 'collapse');
+                    if ($tagName == 'table') {
+                    	$this->value['border']['collapse'] = ($val == 'collapse');
+                    }
                     break;
 
                 case 'border-radius':
@@ -932,17 +1004,29 @@ 
                     if (count($valH) < 1 || count($valH) > 4) {
                         break;
                     }
-                    if ( ! isset($valH[1])) $valH[1] = $valH[0];
-                    if ( ! isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    if ( ! isset($valH[3])) $valH[3] = $valH[1];
+                    if ( ! isset($valH[1])) {
+                    	$valH[1] = $valH[0];
+                    }
+                    if ( ! isset($valH[2])) {
+                    	$valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
+                    }
+                    if ( ! isset($valH[3])) {
+                    	$valH[3] = $valH[1];
+                    }
                     if (isset($val[1])) {
                         $valV = $this->convertToRadius(trim($val[1]));
                         if (count($valV) < 1 || count($valV) > 4) {
                             break;
                         }
-                        if ( ! isset($valV[1])) $valV[1] = $valV[0];
-                        if ( ! isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        if ( ! isset($valV[3])) $valV[3] = $valV[1];
+                        if ( ! isset($valV[1])) {
+                        	$valV[1] = $valV[0];
+                        }
+                        if ( ! isset($valV[2])) {
+                        	$valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
+                        }
+                        if ( ! isset($valV[3])) {
+                        	$valV[3] = $valV[1];
+                        }
                     } else {
                         $valV = $valH;
                     }
@@ -1024,22 +1108,35 @@ 
                     break;
 
                 case 'position':
-                    if ($val == 'absolute')       $this->value['position'] = 'absolute';
-                    else if ($val == 'relative')  $this->value['position'] = 'relative';
-                    else                        $this->value['position'] = null;
+                    if ($val == 'absolute') {
+                    	$this->value['position'] = 'absolute';
+                    } else if ($val == 'relative') {
+                    	$this->value['position'] = 'relative';
+                    } else {
+                    	$this->value['position'] = null;
+                    }
                     break;
 
                 case 'float':
-                    if ($val == 'left')           $this->value['float'] = 'left';
-                    else if ($val == 'right')     $this->value['float'] = 'right';
-                    else                        $this->value['float'] = null;
+                    if ($val == 'left') {
+                    	$this->value['float'] = 'left';
+                    } else if ($val == 'right') {
+                    	$this->value['float'] = 'right';
+                    } else {
+                    	$this->value['float'] = null;
+                    }
                     break;
 
                 case 'display':
-                    if ($val == 'inline')         $this->value['display'] = 'inline';
-                    else if ($val == 'block')     $this->value['display'] = 'block';
-                    else if ($val == 'none')      $this->value['display'] = 'none';
-                    else                        $this->value['display'] = null;
+                    if ($val == 'inline') {
+                    	$this->value['display'] = 'inline';
+                    } else if ($val == 'block') {
+                    	$this->value['display'] = 'block';
+                    } else if ($val == 'none') {
+                    	$this->value['display'] = 'none';
+                    } else {
+                    	$this->value['display'] = null;
+                    }
                     break;
 
                 case 'top':
@@ -1052,7 +1149,9 @@ 
                 case 'list-style':
                 case 'list-style-type':
                 case 'list-style-image':
-                    if ($nom == 'list-style') $nom = 'list-style-type';
+                    if ($nom == 'list-style') {
+                    	$nom = 'list-style-type';
+                    }
                     $this->value[$nom] = $val;
                     break;
 
@@ -1064,11 +1163,17 @@ 
         $return = true;
 
         // only for P tag
-        if ($this->value['margin']['t'] === null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b'] === null) $this->value['margin']['b'] = $this->value['font-size'];
+        if ($this->value['margin']['t'] === null) {
+        	$this->value['margin']['t'] = $this->value['font-size'];
+        }
+        if ($this->value['margin']['b'] === null) {
+        	$this->value['margin']['b'] = $this->value['font-size'];
+        }
 
         // force the text align to left, if asked by html2pdf
-        if ($this->_onlyLeft) $this->value['text-align'] = 'left';
+        if ($this->_onlyLeft) {
+        	$this->value['text-align'] = 'left';
+        }
 
         // correction on the width (quick box)
         if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position'] != 'absolute') {
@@ -1084,30 +1189,60 @@ 
                     $this->value['width'] -= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
                     $return = false;
                 }
-                if ($this->value['width'] < 0) $this->value['width'] = 0;
+                if ($this->value['width'] < 0) {
+                	$this->value['width'] = 0;
+                }
             } else {
                 if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
-                    if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
-                    if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
-                    if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
+                    if ($this->value['border']['l']['width']) {
+                    	$this->value['width'] += $this->value['border']['l']['width'];
+                    }
+                    if ($this->value['border']['r']['width']) {
+                    	$this->value['width'] += $this->value['border']['r']['width'];
+                    }
+                    if ($this->value['padding']['l']) {
+                    	$this->value['width'] += $this->value['padding']['l'];
+                    }
+                    if ($this->value['padding']['r']) {
+                    	$this->value['width'] += $this->value['padding']['r'];
+                    }
                 }
             }
         }
         if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
-            if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
-            if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
-            if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
+            if ($this->value['border']['b']['width']) {
+            	$this->value['height'] += $this->value['border']['b']['width'];
+            }
+            if ($this->value['border']['t']['width']) {
+            	$this->value['height'] += $this->value['border']['t']['width'];
+            }
+            if ($this->value['padding']['b']) {
+            	$this->value['height'] += $this->value['padding']['b'];
+            }
+            if ($this->value['padding']['t']) {
+            	$this->value['height'] += $this->value['padding']['t'];
+            }
         }
 
-        if ($this->value['top'] != null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom'] != null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left'] != null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right'] != null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        if ($this->value['top'] != null) {
+        	$this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
+        }
+        if ($this->value['bottom'] != null) {
+        	$this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
+        }
+        if ($this->value['left'] != null) {
+        	$this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
+        }
+        if ($this->value['right'] != null) {
+        	$this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        }
 
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
-        if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
+        if ($this->value['top'] && $this->value['bottom'] && $this->value['height']) {
+        	$this->value['bottom']  = null;
+        }
+        if ($this->value['left'] && $this->value['right'] && $this->value['width']) {
+        	$this->value['right']   = null;
+        }
 
         return $return;
     }
@@ -1121,7 +1256,9 @@ 
     public function getLineHeight()
     {
         $val = $this->value['line-height'];
-        if ($val == 'normal') $val = '108%';
+        if ($val == 'normal') {
+        	$val = '108%';
+        }
         return $this->convertToMM($val, $this->value['font-size']);
     }
 
@@ -1177,8 +1314,12 @@ 
      */
     public function getFloat()
     {
-        if ($this->value['float'] == 'left')    return 'left';
-        if ($this->value['float'] == 'right')   return 'right';
+        if ($this->value['float'] == 'left') {
+        	return 'left';
+        }
+        if ($this->value['float'] == 'right') {
+        	return 'right';
+        }
         return null;
     }
 
@@ -1208,7 +1349,9 @@ 
     protected function _getLastAbsoluteX()
     {
         for ($k = count($this->table) - 1; $k >= 0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
+            if ($this->table[$k]['x'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['x'];
+            }
         }
         return $this->_pdf->getlMargin();
     }
@@ -1222,7 +1365,9 @@ 
     protected function _getLastAbsoluteY()
     {
         for ($k = count($this->table) - 1; $k >= 0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
+            if ($this->table[$k]['y'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['y'];
+            }
         }
         return $this->_pdf->gettMargin();
     }
@@ -1364,12 +1509,16 @@ 
             // else, it could be the color
             } else {
                 $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
+                if ($res) {
+                	$color = $tmp;
+                }
             }
         }
 
         // if no witdh => return none
-        if ( ! $width) return $none;
+        if ( ! $width) {
+        	return $none;
+        }
 
         // return the border properties
         return array('type' => $type, 'width' => $width, 'color' => $color);
@@ -1474,8 +1623,11 @@ 
     public function convertBackgroundColor($css)
     {
         $res = null;
-        if ($css == 'transparent') return null;
-        else                     return $this->convertToColor($css, $res);
+        if ($css == 'transparent') {
+        	return null;
+        } else {
+        	return $this->convertToColor($css, $res);
+        }
     }
 
     /**
@@ -1487,12 +1639,13 @@ 
      */
     public function convertBackgroundImage($css)
     {
-        if ($css == 'none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
+        if ($css == 'none') {
+                    return null;
+        } else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match)) {
+                    return $match[1];
+        } else {
+                    return null;
+        }
     }
 
     /**
@@ -1513,10 +1666,14 @@ 
 
         // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
         if (count($css) < 2) {
-            if ( ! $css[0]) return null;
+            if ( ! $css[0]) {
+            	return null;
+            }
             $css[1] = 'center';
         }
-        if (count($css) > 2) return null;
+        if (count($css) > 2) {
+        	return null;
+        }
 
         // prepare the values
         $x = 0;
@@ -1524,24 +1681,42 @@ 
         $res = true;
 
         // convert the first value
-        if ($css[0] == 'left')        $x = '0%';
-        else if ($css[0] == 'center') $x = '50%';
-        else if ($css[0] == 'right')  $x = '100%';
-        else if ($css[0] == 'top')    $y = '0%';
-        else if ($css[0] == 'bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
-        else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
-        else $res = false;
+        if ($css[0] == 'left') {
+        	$x = '0%';
+        } else if ($css[0] == 'center') {
+        	$x = '50%';
+        } else if ($css[0] == 'right') {
+        	$x = '100%';
+        } else if ($css[0] == 'top') {
+        	$y = '0%';
+        } else if ($css[0] == 'bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) {
+        	$x = $css[0];
+        } else if ($this->convertToMM($css[0])) {
+        	$x = $this->convertToMM($css[0]);
+        } else {
+        	$res = false;
+        }
 
         // convert the second value
-        if ($css[1] == 'left')        $x = '0%';
-        else if ($css[1] == 'right')  $x = '100%';
-        else if ($css[1] == 'top')    $y = '0%';
-        else if ($css[1] == 'center') $y = '50%';
-        else if ($css[1] == 'bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
-        else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
-        else $res = false;
+        if ($css[1] == 'left') {
+        	$x = '0%';
+        } else if ($css[1] == 'right') {
+        	$x = '100%';
+        } else if ($css[1] == 'top') {
+        	$y = '0%';
+        } else if ($css[1] == 'center') {
+        	$y = '50%';
+        } else if ($css[1] == 'bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) {
+        	$y = $css[1];
+        } else if ($this->convertToMM($css[1])) {
+        	$y = $this->convertToMM($css[1]);
+        } else {
+        	$res = false;
+        }
 
         // return the values
         return array($x, $y);
@@ -1581,13 +1756,22 @@ 
     public function convertToMM($css, $old = 0.)
     {
         $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css .= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4 / 96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4 / 72. * str_replace('pt', '', $css);
-        else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1. * str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1. * $old * str_replace('%', '', $css) / 100.;
-        else                                              $css = null;
+        if (preg_match('/^[0-9\.\-]+$/isU', $css)) {
+        	$css .= 'px';
+        }
+        if (preg_match('/^[0-9\.\-]+px$/isU', $css)) {
+        	$css = 25.4 / 96. * str_replace('px', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) {
+        	$css = 25.4 / 72. * str_replace('pt', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) {
+        	$css = 25.4 * str_replace('in', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) {
+        	$css = 1. * str_replace('mm', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+%$/isU', $css)) {
+        	$css = 1. * $old * str_replace('%', '', $css) / 100.;
+        } else {
+        	$css = null;
+        }
 
         return $css;
     }
@@ -1636,7 +1820,9 @@ 
         $res = true;
 
         // if transparent => return null
-        if (strtolower($css) == 'transparent') return array(null, null, null);
+        if (strtolower($css) == 'transparent') {
+        	return array(null, null, null);
+        }
 
         // HTML color
         if (isset($this->_htmlColor[strtolower($css)])) {
@@ -1697,7 +1883,9 @@ 
             $c = floatVal(substr($c, 0, -1)) / 100.;
         } else {
             $c = floatVal($c);
-            if ($c > 1) $c = $c / 255.;
+            if ($c > 1) {
+            	$c = $c / 255.;
+            }
         }
 
         return $c;
@@ -1751,13 +1939,16 @@ 
                 $name = trim($name);
 
                 // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':') !== false) continue;
+                if (strpos($name, ':') !== false) {
+                	continue;
+                }
 
                 // save the value
-                if ( ! isset($this->css[$name]))
-                    $this->css[$name] = $css;
-                else
-                    $this->css[$name] = array_merge($this->css[$name], $css);
+                if ( ! isset($this->css[$name])) {
+                                    $this->css[$name] = $css;
+                } else {
+                                    $this->css[$name] = array_merge($this->css[$name], $css);
+                }
 
             }
         }

web_interface/astpp/application/libraries/html2pdf/_class/parsingHtml.class.php

Doc Comments +1 added lines

@@ -50,6 +50,7 @@
      * Define the HTML code to parse
      *
      * @param   string HTML code
+     * @param string $html
      * @access  public
      */
     public function setHTML($html)

Braces +65 added lines, -34 removed lines

@@ -115,12 +115,13 @@ 
                         // if it is a closure tag
                         if ($res['close']) {
                             // HTML validation
-                            if (count($parents) < 1)
-                                throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents) - 1] != $res['name'])
-                                throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
-                            else
-                                unset($parents[count($parents) - 1]);
+                            if (count($parents) < 1) {
+                                                            throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
+                            } else if ($parents[count($parents) - 1] != $res['name']) {
+                                                            throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
+                            } else {
+                                                            unset($parents[count($parents) - 1]);
+                            }
                         } else {
                             // if it is a autoclosed tag
                             if ($res['autoclose']) {
@@ -171,7 +172,9 @@ 
                         $txt = str_replace(' ', '&nbsp;', $txt);
 
                         // add a break line
-                        if ($k > 0) $actions[] = $tagPreBr;
+                        if ($k > 0) {
+                        	$actions[] = $tagPreBr;
+                        }
 
                         // save the action
                         $actions[] = array(
@@ -204,21 +207,26 @@ 
             // if it is a Text
             if ($actions[$k]['name'] == 'write') {
                 // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k > 0 && in_array($actions[$k - 1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                if ($k > 0 && in_array($actions[$k - 1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                }
 
                 // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k < $nb - 1 && in_array($actions[$k + 1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                if ($k < $nb - 1 && in_array($actions[$k + 1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                }
 
                 // if the text is empty => remove the action
-                if ( ! strlen($actions[$k]['param']['txt']))
-                    unset($actions[$k]);
+                if ( ! strlen($actions[$k]['param']['txt'])) {
+                                    unset($actions[$k]);
+                }
             }
         }
 
         // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) throw new HTML2PDF_exception(5, $parents);
+        if (count($parents)) {
+        	throw new HTML2PDF_exception(5, $parents);
+        }
 
         // save the actions to do
         $this->code = array_values($actions);
@@ -265,7 +273,9 @@ 
             // if it is a tag
             if ($parse[1][0]) {
                 // save the previous text if it exists
-                if ($str !== '')    $tmp[] = array('txt', $str);
+                if ($str !== '') {
+                	$tmp[] = array('txt', $str);
+                }
 
                 // save the tag, with the offset
                 $tmp[] = array('code', trim($parse[1][0]), $offset);
@@ -282,7 +292,9 @@ 
             unset($parse);
         }
         // if a text is present in the end, we save it
-        if ($str != '') $tmp[] = array('txt', $str);
+        if ($str != '') {
+        	$tmp[] = array('txt', $str);
+        }
         unset($str);
     }
 
@@ -296,7 +308,9 @@ 
     {
         // name of the tag, opening, closure, autoclosure
         $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if ( ! preg_match('/'.$tag.'/isU', $code, $match)) return null;
+        if ( ! preg_match('/'.$tag.'/isU', $code, $match)) {
+        	return null;
+        }
         $close     = ($match[1] == '/' ? true : false);
         $autoclose = preg_match('/\/>$/isU', $code);
         $name      = strtolower($match[2]);
@@ -315,20 +329,23 @@ 
         // read the parameters : nom=valeur
         $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for ($k = 0; $k < count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for ($k = 0; $k < count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom="valeur"
         $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for ($k = 0; $k < count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for ($k = 0; $k < count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom='valeur'
         $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for ($k = 0; $k < count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for ($k = 0; $k < count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // compliance of each parameter
         $color  = "#000000";
@@ -374,19 +391,25 @@ 
 
                 case 'border':
                     unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+                    if (preg_match('/^[0-9]+$/isU', $val)) {
+                    	$val = $val.'px';
+                    }
                     $border = $val;
                     break;
 
                 case 'cellpadding':
                 case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+                    if (preg_match('/^([0-9]+)$/isU', $val)) {
+                    	$param[$key] = $val.'px';
+                    }
                     break;
 
                 case 'colspan':
                 case 'rowspan':
                     $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if ( ! $val) $val = 1;
+                    if ( ! $val) {
+                    	$val = 1;
+                    }
                     $param[$key] = $val;
                     break;
             }
@@ -394,8 +417,11 @@ 
 
         // compliance of the border
         if ($border !== null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
+            if ($border) {
+            	$border = 'border: solid '.$border.' '.$color;
+            } else {
+            	$border = 'border: none';
+            }
 
             $param['style'] .= $border.'; ';
             $param['border'] = $border;
@@ -458,7 +484,9 @@ 
     public function getLevel($k)
     {
         // if the code does not exist => return empty
-        if ( ! isset($this->code[$k])) return array();
+        if ( ! isset($this->code[$k])) {
+        	return array();
+        }
 
         // the tag to detect
         $detect = $this->code[$k]['name'];
@@ -503,16 +531,19 @@ 
 
                 // if we can takin into account the current tag => save it
                 if ( ! $not) {
-                    if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
+                    if (isset($row['style']['text-align'])) {
+                    	unset($row['style']['text-align']);
+                    }
                     $code[] = $row;
                 }
             }
 
             // it continues as long as there has code to analise
-            if (isset($this->code[$k + 1]))
-                $k++;
-            else
-                $end = true;
+            if (isset($this->code[$k + 1])) {
+                            $k++;
+            } else {
+                            $end = true;
+            }
         }
 
         // return the extract

web_interface/astpp/application/libraries/html2pdf/_tcpdf_5.0.002/qrcode.php

Doc Comments +4 added lines, -4 removed lines

@@ -1123,7 +1123,7 @@ 
 		 * @param array $frame
 		 * @param int $maskNo
 		 * @param int $level
-		 * @return array mask
+		 * @return integer mask
 		 */
 		 protected function makeMask($width, $frame, $maskNo, $level) {
 			$masked = array_fill(0, $width, str_repeat("\0", $width));
@@ -1165,7 +1165,7 @@ 
 		/**
 		 * evaluateSymbol
 		 * @param int $width
-		 * @param array $frame
+		 * @param integer $frame
 		 * @return int demerit
 		 */
 		 protected function evaluateSymbol($width, $frame) {
@@ -2035,7 +2035,7 @@ 
 
 		/**
 		 * convertData
-		 * @param array $items
+		 * @param integer $items
 		 * @return array items
 		 */
 		 protected function convertData($items) {
@@ -2490,7 +2490,7 @@ 
 
 		/**
 		 * Return BCH encoded format information pattern.
-		 * @param array $mask
+		 * @param integer $mask
 		 * @param int $level error correction level
 		 * @return BCH encoded format information pattern
 		 */

web_interface/astpp/system/database/DB_result.php

Doc Comments +1 added lines

@@ -64,6 +64,7 @@
 	 * Custom query result.
 	 *
 	 * @param class_name A string that represents the type of object you want back
+	 * @param string $class_name
 	 * @return array of objects
 	 */
 	public function custom_result_object($class_name)

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_driver.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 	 *
 	 * @access	private called by execute()
 	 * @param	string	an SQL query
+	 * @param string $sql
 	 * @return	string
 	 */
 	function _prep_query($sql)

Braces +6 added lines, -4 removed lines

@@ -338,13 +338,15 @@
 	 */
 	function count_all($table = '')
 	{
-		if ($table == '')
-			return '0';
+		if ($table == '') {
+					return '0';
+		}
 	
 		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table);
 		
-		if ($query->num_rows() == 0)
-			return '0';
+		if ($query->num_rows() == 0) {
+					return '0';
+		}
 
 		$row = $query->row();
 		$this->_reset_select();

web_interface/astpp/system/libraries/Encrypt.php

Doc Comments +5 added lines

@@ -293,6 +293,8 @@ 
 	 * @access	private
 	 * @param	string
 	 * @param	string
+	 * @param string $string
+	 * @param string $key
 	 * @return	string
 	 */
 	function _xor_merge($string, $key)
@@ -365,6 +367,7 @@ 
 	 * @param	string
 	 * @param	string
 	 * @param string $data
+	 * @param string $key
 	 * @return	string
 	 */
 	function _add_cipher_noise($data, $key)
@@ -396,6 +399,8 @@ 
 	 *
 	 * @access	public
 	 * @param	type
+	 * @param string $data
+	 * @param string $key
 	 * @return	string
 	 */
 	function _remove_cipher_noise($data, $key)

web_interface/astpp/system/libraries/Fpdf.php

Doc Comments +3 added lines

@@ -1010,6 +1010,9 @@
 	return $this->x;

 }

 

+/**
+ * @param integer $x
+ */
 function SetX($x)

 {

 	// Set x position

Braces +518 added lines, -401 removed lines

@@ -116,26 +116,28 @@ 
 	if (defined('FPDF_FONTPATH'))

 	{

 		$this->fontpath = FPDF_FONTPATH;

-		if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\')

-			$this->fontpath .= '/';

-	}

-	elseif (is_dir(dirname(__FILE__).'/font'))

-		$this->fontpath = dirname(__FILE__).'/font/';

-	else

-		$this->fontpath = '';	

+		if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\') {
+					$this->fontpath .= '/';
+		}
+	} elseif (is_dir(dirname(__FILE__).'/font')) {
+			$this->fontpath = dirname(__FILE__).'/font/';
+	} else {
+			$this->fontpath = '';
+	}
 	// Core fonts

 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', '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 sizes

 	$this->StdPageSizes = 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));

@@ -149,15 +151,14 @@ 
 		$this->DefOrientation = 'P';

 		$this->w = $size[0];

 		$this->h = $size[1];

-	}

-	elseif ($orientation == 'l' || $orientation == 'landscape')

+	} elseif ($orientation == 'l' || $orientation == 'landscape')

 	{

 		$this->DefOrientation = 'L';

 		$this->w = $size[1];

 		$this->h = $size[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;

@@ -197,9 +198,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)

 {

@@ -230,15 +232,17 @@ 
 function SetDisplayMode($zoom, $layout='default')

 {

 	// 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);
+	}
+	}

 

 /**
  * @param boolean $compress
@@ -246,49 +250,55 @@ 
 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;

 }

 

@@ -313,10 +323,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();

@@ -330,8 +342,9 @@ 
 function AddPage($orientation = '', $size = '')

 {

 	// 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' : '');

 	$fontsize = $this->FontSizePt;

@@ -357,15 +370,18 @@ 
 	$this->LineWidth = $lw;

 	$this->_out(sprintf('%.2F w', $lw * $this->k));

 	// Set font

-	if ($family)

-		$this->SetFont($family, $style, $fontsize);

+	if ($family) {
+			$this->SetFont($family, $style, $fontsize);
+	}
 	// 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

@@ -379,8 +395,9 @@ 
 		$this->_out(sprintf('%.2F w', $lw * $this->k));

 	}

 	// Restore font

-	if ($family)

-		$this->SetFont($family, $style, $fontsize);

+	if ($family) {
+			$this->SetFont($family, $style, $fontsize);
+	}
 	// Restore colors

 	if ($this->DrawColor != $dc)

 	{

@@ -415,13 +432,15 @@ 
 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);
+	}
+	}

 

 /**
  * @param integer $r
@@ -431,22 +450,25 @@ 
 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);

 }

 

@@ -594,20 +616,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()

 {

@@ -620,10 +645,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);

 }

 

@@ -641,10 +668,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);

 }

 

@@ -676,62 +705,75 @@ 
 			$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($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($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;

-}

 

 /**
  * @param integer $w
@@ -741,13 +783,15 @@ 
 {

 	// 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)

 	{

@@ -756,14 +800,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;

 		}

 	}

@@ -792,8 +837,9 @@ 
 			$l = 0;

 			$ns = 0;

 			$nl++;

-			if ($border && $nl == 2)

-				$b = $b2;

+			if ($border && $nl == 2) {
+							$b = $b2;
+			}
 			continue;

 		}

 		if ($c == ' ')

@@ -808,16 +854,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')

 				{

@@ -832,11 +878,12 @@ 
 			$l = 0;

 			$ns = 0;

 			$nl++;

-			if ($border && $nl == 2)

-				$b = $b2;

-		}

-		else

-			$i++;

+			if ($border && $nl == 2) {
+							$b = $b2;
+			}
+		} else {
+					$i++;
+		}
 	}

 	// Last chunk

 	if ($this->ws > 0)

@@ -844,8 +891,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;

 }

@@ -884,8 +932,9 @@ 
 			$nl++;

 			continue;

 		}

-		if ($c == ' ')

-			$sep = $i;

+		if ($c == ' ') {
+					$sep = $i;
+		}
 		$l += $cw[$c];

 		if ($l > $wmax)

 		{

@@ -903,11 +952,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;

@@ -922,24 +971,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 = '')

 {

@@ -950,22 +1001,25 @@ 
 		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)

@@ -974,14 +1028,18 @@ 
 		$w = -96;

 		$h = -96;

 	}

-	if ($w < 0)

-		$w = -$info['w'] * 72 / $w / $this->k;

-	if ($h < 0)

-		$h = -$info['h'] * 72 / $h / $this->k;

-	if ($w == 0)

-		$w = $h * $info['w'] / $info['h'];

-	if ($h == 0)

-		$h = $w * $info['h'] / $info['w'];

+	if ($w < 0) {
+			$w = -$info['w'] * 72 / $w / $this->k;
+	}
+	if ($h < 0) {
+			$h = -$info['h'] * 72 / $h / $this->k;
+	}
+	if ($w == 0) {
+			$w = $h * $info['w'] / $info['h'];
+	}
+	if ($h == 0) {
+			$h = $w * $info['h'] / $info['w'];
+	}
 

 	// Flowing mode

 	if ($y === null)

@@ -997,12 +1055,14 @@ 
 		$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()

 {

@@ -1013,11 +1073,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()

 {

@@ -1029,11 +1090,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;
+	}
+	}

 

 /**
  * @param integer $x
@@ -1048,8 +1110,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 == '')

 	{

@@ -1089,8 +1152,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;

@@ -1111,22 +1175,26 @@ 
 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');
+	}
 	// Ensure runtime magic quotes are disabled

-	if (get_magic_quotes_runtime())

-		@set_magic_quotes_runtime(0);

-}

+	if (get_magic_quotes_runtime()) {
+			@set_magic_quotes_runtime(0);
+	}
+	}

 

 function _checkoutput()

 {

 	if (PHP_SAPI != 'cli')

 	{

-		if (headers_sent($file, $line))

-			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");

+		if (headers_sent($file, $line)) {
+					$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+		}
 	}

 	if (ob_get_length())

 	{

@@ -1146,17 +1214,18 @@ 
 	if (is_string($size))

 	{

 		$size = strtolower($size);

-		if ( ! isset($this->StdPageSizes[$size]))

-			$this->Error('Unknown page size: '.$size);

+		if ( ! isset($this->StdPageSizes[$size])) {
+					$this->Error('Unknown page size: '.$size);
+		}
 		$a = $this->StdPageSizes[$size];

 		return array($a[0] / $this->k, $a[1] / $this->k);

-	}

-	else

+	} else

 	{

-		if ($size[0] > $size[1])

-			return array($size[1], $size[0]);

-		else

-			return $size;

+		if ($size[0] > $size[1]) {
+					return array($size[1], $size[0]);
+		} else {
+					return $size;
+		}
 	}

 }

 

@@ -1173,14 +1242,16 @@ 
 	$this->y = $this->tMargin;

 	$this->FontFamily = '';

 	// Check page size and orientation

-	if ($orientation == '')

-		$orientation = $this->DefOrientation;

-	else

-		$orientation = strtoupper($orientation[0]);

-	if ($size == '')

-		$size = $this->DefPageSize;

-	else

-		$size = $this->_getpagesize($size);

+	if ($orientation == '') {
+			$orientation = $this->DefOrientation;
+	} else {
+			$orientation = strtoupper($orientation[0]);
+	}
+	if ($size == '') {
+			$size = $this->DefPageSize;
+	} else {
+			$size = $this->_getpagesize($size);
+	}
 	if ($orientation != $this->CurOrientation || $size[0] != $this->CurPageSize[0] || $size[1] != $this->CurPageSize[1])

 	{

 		// New size or orientation

@@ -1199,9 +1270,10 @@ 
 		$this->CurOrientation = $orientation;

 		$this->CurPageSize = $size;

 	}

-	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1])

-		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);

-}

+	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1]) {
+			$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+	}
+	}

 

 function _endpage()

 {

@@ -1216,8 +1288,9 @@ 
 	// Load a font definition file from the font directory

 	include($this->fontpath.$font);

 	$a = get_defined_vars();

-	if ( ! isset($a['name']))

-		$this->Error('Could not include font definition file');

+	if ( ! isset($a['name'])) {
+			$this->Error('Could not include font definition file');
+	}
 	return $a;

 }

 

@@ -1253,15 +1326,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);

@@ -1283,16 +1354,19 @@ 
 {

 	// 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;

 	$data = file_get_contents($file);

 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);

@@ -1305,8 +1379,9 @@ 
 {

 	// 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);
+	}
 	$info = $this->_parsepngstream($f, $file);

 	fclose($f);

 	return $info;

@@ -1315,33 +1390,40 @@ 
 function _parsepngstream($f, $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 || $ct == 4)

-		$colspace = 'DeviceGray';

-	elseif ($ct == 2 || $ct == 6)

-		$colspace = 'DeviceRGB';

-	elseif ($ct == 3)

-		$colspace = 'Indexed';

-	else

-		$this->Error('Unknown color type: '.$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 || $ct == 4) {
+			$colspace = 'DeviceGray';
+	} elseif ($ct == 2 || $ct == 6) {
+			$colspace = 'DeviceRGB';
+	} elseif ($ct == 3) {
+			$colspace = 'Indexed';
+	} else {
+			$this->Error('Unknown color type: '.$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);

 	$dp = '/Predictor 15 /Colors '.($colspace == 'DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;

 

@@ -1358,44 +1440,45 @@ 
 			// 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);
+	}
 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);

 	if ($ct >= 4)

 	{

 		// Extract alpha channel

-		if ( ! function_exists('gzuncompress'))

-			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);

+		if ( ! function_exists('gzuncompress')) {
+					$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+		}
 		$data = gzuncompress($data);

 		$color = '';

 		$alpha = '';

@@ -1429,8 +1512,9 @@ 
 		unset($data);

 		$data = gzcompress($color);

 		$info['smask'] = gzcompress($alpha);

-		if ($this->PDFVersion < '1.4')

-			$this->PDFVersion = '1.4';

+		if ($this->PDFVersion < '1.4') {
+					$this->PDFVersion = '1.4';
+		}
 	}

 	$info['data'] = $data;

 	return $info;

@@ -1443,13 +1527,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;

 }

 

@@ -1463,13 +1549,16 @@ 
 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);

 	$f = @fopen('php://temp', 'rb+');

 	if ($f)

@@ -1483,15 +1572,16 @@ 
 		rewind($f);

 		$info = $this->_parsepngstream($f, $file);

 		fclose($f);

-	}

-	else

+	} else

 	{

 		// Use temporary file

 		$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);

@@ -1517,11 +1607,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()

 {

@@ -1529,15 +1620,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->DefPageSize[0] * $this->k;

 		$hPt = $this->DefPageSize[1] * $this->k;

-	}

-	else

+	} else

 	{

 		$wPt = $this->DefPageSize[1] * $this->k;

 		$hPt = $this->DefPageSize[0] * $this->k;

@@ -1549,8 +1640,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]))

 		{

@@ -1560,9 +1652,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;

@@ -1571,8 +1663,9 @@ 
 			}

 			$this->_out($annots.']');

 		}

-		if ($this->PDFVersion > '1.3')

-			$this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');

+		if ($this->PDFVersion > '1.3') {
+					$this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+		}
 		$this->_out('/Contents '.($this->n + 1).' 0 R>>');

 		$this->_out('endobj');

 		// Page content

@@ -1587,8 +1680,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));

@@ -1612,17 +1706,21 @@ 
 		$this->_newobj();

 		$this->FontFiles[$file]['n'] = $this->n;

 		$font = file_get_contents($this->fontpath.$file, true);

-		if ( ! $font)

-			$this->Error('Font file not found: '.$file);

+		if ( ! $font) {
+					$this->Error('Font file not found: '.$file);
+		}
 		$compressed = (substr($file, -2) == '.z');

-		if ( ! $compressed && isset($info['length2']))

-			$font = substr($font, 6, $info['length1']).substr($font, 6 + $info['length1'] + 6, $info['length2']);

+		if ( ! $compressed && isset($info['length2'])) {
+					$font = substr($font, 6, $info['length1']).substr($font, 6 + $info['length1'] + 6, $info['length2']);
+		}
 		$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');

@@ -1640,12 +1738,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/OpenType font

 			$this->_newobj();

@@ -1655,36 +1753,40 @@ 
 			$this->_out('/FirstChar 32 /LastChar 255');

 			$this->_out('/Widths '.($this->n + 1).' 0 R');

 			$this->_out('/FontDescriptor '.($this->n + 2).' 0 R');

-			if (isset($font['diffn']))

-				$this->_out('/Encoding '.($nf + $font['diffn']).' 0 R');

-			else

-				$this->_out('/Encoding /WinAnsiEncoding');

+			if (isset($font['diffn'])) {
+							$this->_out('/Encoding '.($nf + $font['diffn']).' 0 R');
+			} else {
+							$this->_out('/Encoding /WinAnsiEncoding');
+			}
 			$this->_out('>>');

 			$this->_out('endobj');

 			// Widths

 			$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;

-			if ( ! empty($font['file']))

-				$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';

+			foreach ($font['desc'] as $k=>$v) {
+							$s .= ' /'.$k.' '.$v;
+			}
+			if ( ! empty($font['file'])) {
+							$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['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);

 		}

 	}

@@ -1708,28 +1810,33 @@ 
 	$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['dp']))

-		$this->_out('/DecodeParms <<'.$info['dp'].'>>');

+	if (isset($info['f'])) {
+			$this->_out('/Filter /'.$info['f']);
+	}
+	if (isset($info['dp'])) {
+			$this->_out('/DecodeParms <<'.$info['dp'].'>>');
+	}
 	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.']');

 	}

-	if (isset($info['smask']))

-		$this->_out('/SMask '.($this->n + 1).' 0 R');

+	if (isset($info['smask'])) {
+			$this->_out('/SMask '.($this->n + 1).' 0 R');
+	}
 	$this->_out('/Length '.strlen($info['data']).'>>');

 	$this->_putstream($info['data']);

 	$this->_out('endobj');

@@ -1754,16 +1861,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();

@@ -1786,16 +1895,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')));

 }

 

@@ -1803,21 +1917,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 '.sprintf('%.2F', $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 '.sprintf('%.2F', $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()

 {

@@ -1853,8 +1969,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('<<');

web_interface/astpp/system/libraries/Ftp.php

Doc Comments +1 added lines

@@ -461,6 +461,7 @@
 	 * @param	string	the file path
 	 * @param	string	the permissions
 	 * @param integer $perm
+	 * @param string $path
 	 * @return	bool
 	 */
 	function chmod($path, $perm)